r26014 - in /branches/frame_order_cleanup: ./ test_suite/test_suite_runner.py -- September 24, 2014 - 14:57

Author: bugman
Date: Wed Sep 24 14:57:19 2014
New Revision: 26014

URL: http://svn.gna.org/viewcvs/relax?rev=26014&view=rev
Log:
Merged revisions 26013 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26013 | bugman | 2014-09-24 14:56:45 +0200 (Wed, 24 Sep 2014) | 5 lines
  
  Fix for the test suite summary printout function for the new --no-skip 
option.
  
  The relax status object was clashing with a variable of the same name.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/test_suite_runner.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 24 14:57:19 2014
@@ -1 +1 @@
-/trunk:1-26011
+/trunk:1-26013

Modified: branches/frame_order_cleanup/test_suite/test_suite_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/test_suite_runner.py?rev=26014&r1=26013&r2=26014&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/test_suite_runner.py        
(original)
+++ branches/frame_order_cleanup/test_suite/test_suite_runner.py        Wed 
Sep 24 14:57:19 2014
@@ -308,10 +308,10 @@
         # Synopsis.
         if hasattr(self, 'system_result') and hasattr(self, 'unit_result') 
and hasattr(self, 'gui_result') and hasattr(self, 'verification_result'):
             if self.gui_result == "skip":
-                status = self.system_result and self.unit_result and 
self.verification_result
+                test_status = self.system_result and self.unit_result and 
self.verification_result
             else:
-                status = self.system_result and self.unit_result and 
self.gui_result and self.verification_result
-            summary_line("Synopsis", status)
+                test_status = self.system_result and self.unit_result and 
self.gui_result and self.verification_result
+            summary_line("Synopsis", test_status)
 
         # End.
         print('\n\n')