Changes in test/utest_sasview.py [b54440d:aaf5e49] in sasview

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
 
-                    has_failed = "FAILED (" in std_out
-                    m = re.search("FAILED \(.*errors=([0-9]+)", 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 or not has_tests:
+                    
+                    if has_failed:
                         failed += 1
                         print("Result for %s (%s): FAILED" % (module_name, module_dir))
@@ -101 +102 @@
         print("    Test errors:  %d" % n_errors)
     print("----------------------------------------------")
-
+    
     return failed
 
@@ -109 +110 @@
     if run_tests(dirs=dirs, all=all)>0:
         sys.exit(1)
-
+