Changeset 6c00702 in sasview for test/utest_sansview.py

Timestamp:

Apr 4, 2014 10:44:59 AM (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:

d44648e

Parents:

e6d9703

Message:

correct fitting tests so that they run (though not yet automatically)

File:

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

test/utest_sansview.py

@@ -26 +26 @@
 #    COMMAND_SEP = '&'
 
-def run_tests():
+def run_tests(dirs=None, all=False):
     test_root = os.path.abspath(os.path.dirname(__file__))
     run_one_py = os.path.join(test_root, 'run_one.py')
@@ -35 +35 @@
     n_failures = 0
     
-    for d in os.listdir(test_root):
+    for d in (dirs if dirs else os.listdir(test_root)):
         
         # Check for modules to be skipped
@@ -76 +76 @@
                         passed += 1
                         print "Result for %s: SUCCESS" % module_name
-                        
+
     print "\n----------------------------------------------"
-    print "Results by test modules:"
-    print "    PASSED: %d" % passed
-    ratio = 100.0*failed/(failed+passed)
-    print "    FAILED: %d    (%.0f%%)" % (failed,ratio) 
-    
-    print "Results by tests:"
-    print "    Tests run:    %d" % n_tests
-    print "    Tests failed: %d" % n_failures
-    print "    Test errors:  %d" % n_errors 
+    if n_tests == 0:
+        print "No tests."
+    else:
+        print "Results by test modules:"
+        print "    PASSED: %d" % passed
+        ratio = 100.0*failed/(failed+passed)
+        print "    FAILED: %d    (%.0f%%)" % (failed,ratio)
+
+        print "Results by tests:"
+        print "    Tests run:    %d" % n_tests
+        print "    Tests failed: %d" % n_failures
+        print "    Test errors:  %d" % n_errors
     print "----------------------------------------------"
     
@@ -92 +95 @@
 
 if __name__ == '__main__':
-    if run_tests()>0:
+    all = (len(sys.argv) > 1 and sys.argv[1] == '-all')
+    dirs = sys.argv[1:] if not all else sys.argv[2:]
+    if run_tests(dirs=dirs, all=all)>0:
         sys.exit(1)