Changeset 7dd309a in sasview

Timestamp:

Jul 26, 2018 6:38:08 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

573c383

Parents:

dc71408

git-author:

Piotr Rozyczko <rozyczko@…> (07/26/18 06:37:44)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/26/18 06:38:08)

Message:

Improved failure/error display

File:

• src/sas/qtgui/GUITests.py (modified) (3 diffs)

src/sas/qtgui/GUITests.py

@@ -15 +15 @@
 
 To get more verbose console output (recommended), use ``python GUITests.py -v``
-or modify tge VERBOSITY module variable.
 """
 
@@ -28 +27 @@
     'perspectivesSuite',
     ]
-
-# Define output verbosity
-#VERBOSITY = 0 # quiet - just the total number of tests run and global result
-VERBOSITY = 1 # default - quiet + a dot for every successful test or a F for failure
-#VERBOSITY = 2 # verbose - default + help string of every test and the result
 
 # Prepare the general QApplication instance
@@ -196 +190 @@
     if len(sys.argv) > 1:
         user_suites = sys.argv[1:]
-
-    runner = unittest.TextTestRunner(verbosity=VERBOSITY)
+    errors = {}
     for suite in user_suites:
         # create the suite object from name
         try:
+
             suite_instance = globals()[suite]()
-            results = runner.run(suite_instance)
+            result=unittest.TextTestResult(sys.stdout,True,True)
+            print("\nRunning %d test cases for %s"%(suite_instance.countTestCases(), suite))
+            result.buffer=True
+            suite_instance.run(result)
+
+            if not result.wasSuccessful():
+                if len(result.errors) or len(result.failures):
+                    errors[suite] = (result.errors, result.failures)
+                if len(result.errors):
+                    print("\n============ Errors disovered ===================")
+                if len(result.failures):
+                    print("\n============ Failures disovered =================")
+            else:
+                print("\nAll tests successful")
+
         except KeyError:
+            print("Failure : %s "%str(ex))
             print("ERROR: Incorrect suite name: %s " % suite)
             pass
+
+    if len(errors.keys())>0:
+        for suite, errors in errors.items():
+            for r in errors[0]:
+                    print("\nSuite: %s had following errors:\n %s : %s"%(suite, r[0], r[1]))
+            for r in errors[1]:
+                    print("\nSuite: %s had following failures:\n %s : %s"%(suite, r[0], r[1]))
+            print("=================================================")