Changeset 9e308a3 in sasview

Timestamp:

Sep 23, 2017 1:49:08 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1d014cb

Parents:

d04ac05

Message:

tweak utests so it is slightly easier to identify and run failing tests

Location:

test

Files:

• run_one.py (modified) (1 prop)
• utest_sasview.py (modified) (4 diffs, 1 prop)

test/utest_sasview.py

@@ -25 +25 @@
     import matplotlib
     import wx
-except:
+except ImportError:
     HAS_MPL_WX = False
 
@@ -36 +36 @@
 #    COMMAND_SEP = '&'
 
-def run_tests(dirs=None, all=False):
+def run_tests(dirs=None, run_all=False):
     test_root = os.path.abspath(os.path.dirname(__file__))
     run_one_py = os.path.join(test_root, 'run_one.py')
@@ -82 +82 @@
                     if has_failed or not has_tests:
                         failed += 1
-                        print("Result for %s (%s): FAILED" % (module_name, module_dir))
+                        modpath = os.path.join(module_dir, module_name+".py")
+                        print("Result for %s: FAILED    %s"
+                              % (module_name, os.path.relpath(modpath, os.getcwd())))
                         #print(std_out)
                     else:
@@ -106 +108 @@
 
 if __name__ == '__main__':
-    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:
+    run_all = (len(sys.argv) > 1 and sys.argv[1] == '-all')
+    dirs = sys.argv[1:] if not run_all else sys.argv[2:]
+    if run_tests(dirs=dirs, run_all=run_all)>0:
         sys.exit(1)