Merge lp:~mike-amy/sahana-eden/test_framework into lp:sahana-eden

[Mike Amy]

moved run.py out of tests folder
(=> less confusion as to what to run)

Workaround for an issue in nose where our adjusted arguments are ignored if not read from sys.argv.
(=> nose plugins work, e.g. coverage)

=== added directory 'modules/test_utils'
=== added file 'modules/test_utils/__init__.py'
--- modules/test_utils/__init__.py	1970-01-01 00:00:00 +0000
+++ modules/test_utils/__init__.py	2011-08-11 19:33:44 +0000
@@ -0,0 +1,2 @@
+
+from compare_lines import compare_lines
\ No newline at end of file

=== added file 'modules/test_utils/compare_lines.py'
--- modules/test_utils/compare_lines.py	1970-01-01 00:00:00 +0000
+++ modules/test_utils/compare_lines.py	2011-08-11 19:33:44 +0000
@@ -0,0 +1,15 @@
+
+
+def compare_lines(test, expected, actual):
+    line = 1
+    expected_lines = expected.split('\n')
+    actual_lines = actual.split('\n')
+    for expected_line, actual_line in zip(expected_lines, actual_lines):
+        test.assertEquals(
+            actual_line,
+            expected_line,
+            "%s: '%s' != '%s'" % (line, actual_line, expected_line)
+        )
+        line += 1
+    test.assertEquals(len(expected_lines), len(actual_lines))
+

=== renamed file 'tests/run.py' => 'modules/test_utils/run.py'
--- tests/run.py	2011-08-11 16:22:44 +0000
+++ modules/test_utils/run.py	2011-08-11 19:33:44 +0000
@@ -126,9 +126,9 @@
 log = sys.stderr.write
 
 import unittest
-
-
-test_folder = os.path.join("applications", application_name, "tests", "unit_tests")
+from itertools import imap
+
+test_folders = set()
 
 class Web2pyNosePlugin(nose.plugins.base.Plugin):
     # see: http://somethingaboutorange.com/mrl/projects/nose/0.11.1/plugins/writing.html
@@ -157,6 +157,7 @@
         
     def options(self, parser, env):
         """Register command line options"""
+        return
         parser.add_option(
             "--web2py",
             dest="web2py",
@@ -169,14 +170,9 @@
         return bool(re.search(self.directory_pattern, dirname))
 
     def wantFile(self, file_name):
-        if file_name.endswith(
-            os.path.join(test_folder, "run.py")
-        ) or file_name.endswith(
-            os.path.join(test_folder, "nose.py")
-        ):
-            return False
-        else:
-            return test_folder in file_name and file_name.endswith(".py")
+        return file_name.endswith(".py") and any(
+            imap(file_name.__contains__, test_folders)
+        )
 
     def wantModule(self, module):
         return False
@@ -247,19 +243,60 @@
         
 import re
 
+argv = [
+    #"--verbosity=2",
+    #"--debug=nose"
+]
+
+# folder in which tests are kept
+# non-option arguments (test paths) are made relative to this
+test_root = os.path.join("applications", application_name, "tests", "unit_tests")
+
+disallowed_options = {}
+disallowed_options["-w"] = disallowed_options["--where"] = (
+    "web2py does not allow changing directory"
+)
+for arg in sys.argv[1:]:
+    if arg.startswith("-"):
+        if not arg.startswith("--"):
+            print (
+                "\nSorry, please use verbose option names "
+                "(currently need this to distinguish options from paths)"
+            )
+            sys.exit(1)
+        else:
+            try:
+                reason = disallowed_options[arg]
+            except KeyError:
+                pass
+            else:
+                print "\nSorry, %s option is not accepted as %s" % (arg, reason)
+                sys.exit(1)
+            argv.append(arg)
+    else:
+        test_path = arg
+        test_fuller_path = os.path.join(test_root, test_path)
+        test_folders.add(test_fuller_path)
+        if not os.path.exists(test_fuller_path):
+            print "\n", test_fuller_path, "not found"
+            #sys.exit(1)
+
+# test paths in command line aren't passed, just added to test_folders
+# the plugin does the testing
+# nose just searches everything from the test_root
+# so we give it the test root
+argv.append(test_root)
+
+# if no test folders are given, assume we test everything from the test_root
+if len(test_folders) == 0:
+    test_folders.add(test_root)
+
+sys.argv[1:] = argv
+
 nose.main(
-    argv = [
-        "--verbosity=2",
-        #"--debug=nose"
-    ] + map((
-            lambda test_path: 
-                os.path.join(
-                    "applications", application_name, "tests", "unit_tests", test_path
-                )
-        ),
-        sys.argv[1:]
-    ),
-    plugins = nose.plugins.PluginManager([
+# seems at least this version of nose ignores passed in argv
+#    argv = argv, 
+    addplugins = nose.plugins.PluginManager([
         Web2pyNosePlugin(
             application_name,
             globals(),

=== modified file 'tests/nose.py'
--- tests/nose.py	2011-07-23 18:41:53 +0000
+++ tests/nose.py	2011-08-11 19:33:44 +0000
@@ -21,7 +21,12 @@
         join("..","..","..","web2py.py"),
         "--shell=" + application_name,
         "--import_models",
-        "--run "+join("applications",application_name,"tests","run.py"),
+        
+        "--run "+join(
+            # the code that makes all the test folders relative to
+            # tests/unit_tests is in modules/test_utils/run.py
+            "applications",application_name,"modules","test_utils","run.py"
+        ),
         "--args"
     ] + sys.argv[1:] # nose arguments
 )