Changeset b54440d in sasview

Timestamp:

Aug 30, 2017 10:42:53 AM (7 years ago)

Author:

Paul Kienzle <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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, a78a02f

Parents:

d713729

Message:

identify tests with any mixture of errors and failures

File:

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

test/utest_sasview.py

@@ -44 +44 @@
     n_errors = 0
     n_failures = 0
-    
+
     for d in (dirs if dirs else os.listdir(test_root)):
-        
+
         # Check for modules to be skipped
         if d in SKIPPED_DIRS:
             continue
-        
+
 
         # Go through modules looking for unit tests
@@ -64 +64 @@
                     #print std_out
                     #sys.exit()
-                    has_failed = True
                     m = re.search("Ran ([0-9]+) test", std_out)
                     if m is not None:
-                        has_failed = False
                         n_tests += int(m.group(1))
+                        has_tests = True
+                    else:
+                        has_tests = False
 
-                    m = re.search("FAILED \(errors=([0-9]+)\)", std_out)
+                    has_failed = "FAILED (" in std_out
+                    m = re.search("FAILED \(.*errors=([0-9]+)", std_out)
                     if m is not None:
-                        has_failed = True
                         n_errors += int(m.group(1))
-                    
-                    m = re.search("FAILED \(failures=([0-9]+)\)", std_out)
+                    m = re.search("FAILED \(.*failures=([0-9]+)", std_out)
                     if m is not None:
-                        has_failed = True
                         n_failures += int(m.group(1))
-                    
-                    if has_failed:
+
+                    if has_failed or not has_tests:
                         failed += 1
                         print("Result for %s (%s): FAILED" % (module_name, module_dir))
@@ -102 +101 @@
         print("    Test errors:  %d" % n_errors)
     print("----------------------------------------------")
-    
+
     return failed
 
@@ -110 +109 @@
     if run_tests(dirs=dirs, all=all)>0:
         sys.exit(1)
-    
+