From c292dcfc6bf96ebf5f34342beb1367aa5361f7c4 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom.willemsen@archlinux.us>
Date: Thu, 28 Apr 2011 13:19:42 -0500
Subject: isotests: various changes and updates

* isotests/fixtures/clockchoices.json: changed 'default' to 'unchanged'
* isotests/fixtures/filesystems.json: removed 'check the installed
  system' line from one of the options
* isotests/fixtures/modules.json: added
  'ext2','ext3','ext4','swap','xfs','jfs','reiserFS'
* isotests/models.py:
	* Added RollbackOption abstract class that adds the functions
	  get_rollback_success_test and get_rollback_failed_test on top of
	  the IsoOption abstract class for use with the Filesystem and
	  Module classes since Test uses these both in 2 ways (regular and
	  rollback). This keeps them seperated.
	* renamed the related names of these properties from rollback_test
	  to rollback_test_set (seems more in-tune with the other relations)
* isotests/views.py:
	* changed the order of the fields, the automatic order makes no
	  sense.
	* Added help texts to the fields success, filesystem,
	  rollback_filesystem and rollback_modules.
	* Removed help text from modules (made no sense)
	* Added a website field, should remain empty, a simplistic way to
	  hopefully reduce spambot entries.
* templates/isotests/results.html:
	* Removed the rollback yes/no section
	* The rollback labels should check get_rollback_success_test and
	  get_rollback_failed_test.
* Rollback checkbox removed.
* Clearly tell users that success must only be selected if everything
  works right.
* Clearly tell users to only fill in the rollback options if they did a
  rollback.
* Added a thanks page that tells people thanks.
* Added links between the pages.
* Added links to lists with tests of either a specific iso or of any
  iso where a specific option was selected.

Signed-off-by: Dan McGee <dan@archlinux.org>

Conflicts:

	templates/isotests/results.html
---
 isotests/fixtures/clockchoices.json |  2 +-
 isotests/fixtures/filesystems.json  |  2 +-
 isotests/fixtures/modules.json      | 49 +++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'isotests/fixtures')

diff --git a/isotests/fixtures/clockchoices.json b/isotests/fixtures/clockchoices.json
index 2c078128..6dfd06e1 100644
--- a/isotests/fixtures/clockchoices.json
+++ b/isotests/fixtures/clockchoices.json
@@ -3,7 +3,7 @@
 	"pk": 1,
 	"model": "isotests.clockchoice",
 	"fields": {
-	    "name": "default"
+	    "name": "unchanged"
 	}
     },
     {
diff --git a/isotests/fixtures/filesystems.json b/isotests/fixtures/filesystems.json
index 4d3f1bc4..5386c391 100644
--- a/isotests/fixtures/filesystems.json
+++ b/isotests/fixtures/filesystems.json
@@ -3,7 +3,7 @@
 	"pk": 1,
 	"model": "isotests.filesystem",
 	"fields": {
-	    "name": "autoprepare (check the installed system, incl fstab)"
+	    "name": "autoprepare"
 	}
     },
     {
diff --git a/isotests/fixtures/modules.json b/isotests/fixtures/modules.json
index 27d04c7a..ae8a1683 100644
--- a/isotests/fixtures/modules.json
+++ b/isotests/fixtures/modules.json
@@ -33,5 +33,54 @@
 	"fields": {
 	    "name": "btrfs"
 	}
+    },
+    {
+        "pk": 6,
+        "model": "isotests.module",
+        "fields": {
+            "name": "ext2"
+        }
+    },
+    {
+        "pk": 7,
+        "model": "isotests.module",
+        "fields": {
+            "name": "ext3"
+        }
+    },
+    {
+        "pk": 8,
+        "model": "isotests.module",
+        "fields": {
+            "name": "ext4"
+        }
+    },
+    {
+        "pk": 9,
+        "model": "isotests.module",
+        "fields": {
+            "name": "swap"
+        }
+    },
+    {
+        "pk": 10,
+        "model": "isotests.module",
+        "fields": {
+            "name": "xfs"
+        }
+    },
+    {
+        "pk": 11,
+        "model": "isotests.module",
+        "fields": {
+            "name": "jfs"
+        }
+    },
+    {
+        "pk": 12,
+        "model": "isotests.module",
+        "fields": {
+            "name": "reiserFS"
+        }
     }
 ]
-- 
cgit v1.2.3-2-g168b