Changeset bbd97e5 in sasview for test/utest_sansview.py

Timestamp:

Apr 3, 2014 6:59:01 PM (10 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

eea06fe

Parents:

27b7acc

Message:

Allow tests to be run without installing sasview

File:

• test/utest_sansview.py (modified) (5 diffs)

test/utest_sansview.py

@@ -8 +8 @@
     print "xmlrunner needs to be installed to run these tests"
     print "Try easy_install unittest-xml-reporting"
+    sys.exit(1)
 
 # Check whether we have matplotlib installed
@@ -21 +22 @@
     SKIPPED_DIRS.append("sansguiframe")
 
-COMMAND_SEP = ';'
-if os.name == 'nt':
-    COMMAND_SEP = '&'
+#COMMAND_SEP = ';'
+#if os.name == 'nt':
+#    COMMAND_SEP = '&'
 
 def run_tests():
+    test_root = os.path.abspath(os.path.dirname(__file__))
+    run_one_py = os.path.join(test_root, 'run_one.py')
     passed = 0
     failed = 0
@@ -32 +35 @@
     n_failures = 0
     
-    for d in os.listdir(os.getcwd()):
+    for d in os.listdir(test_root):
         
         # Check for modules to be skipped
@@ -39 +42 @@
         
         # Go through modules looking for unit tests
-        module_dir = os.path.join(os.getcwd(),d,"test")
+        module_dir = os.path.join(test_root, d, "test")
         if os.path.isdir(module_dir):
             for f in os.listdir(module_dir):
@@ -45 +48 @@
                 if os.path.isfile(file_path) and f.startswith("utest_") and f.endswith(".py"):
                     module_name,_ = os.path.splitext(f)
-                    code = "cd %s%s%s -c \"import sys;import xmlrunner;import unittest;sys.path.insert(0, '%s');" % (module_dir, COMMAND_SEP, sys.executable, module_dir)
-                    code += "from %s import *;" % module_name
-                    code += "unittest.main(testRunner=xmlrunner.XMLTestRunner(output='logs'))\""
+                    code = '"%s" %s %s'%(sys.executable, run_one_py, file_path)
                     proc = subprocess.Popen(code, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT)
                     std_out, std_err = proc.communicate()
+                    #print std_out
+                    #sys.exit()
                     has_failed = True
                     m = re.search("Ran ([0-9]+) test", std_out)