Author: bugman Date: Thu Mar 8 07:54:11 2007 New Revision: 3119 URL: http://svn.gna.org/viewcvs/relax?rev=3119&view=rev Log: Manually merged r3117 of the 1.3 line. The command used was: svn merge -r3116:3117 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3/test_suite/system_tests/main.py test_suite/test_suite.py ..... r3117 | bugman | 2007-03-08 17:29:01 +1100 (Thu, 08 Mar 2007) | 5 lines Changed paths: M /1.3/test_suite/system_tests/main.py Fix for bug #8682 (https://gna.org/bugs/index.php?8682). The flag 'global_pass' in the summary() method of the system/functional tests had never been set up! ..... Modified: 1.2/test_suite/test_suite.py Modified: 1.2/test_suite/test_suite.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/test_suite.py?rev=3119&r1=3118&r2=3119&view=diff ============================================================================== --- 1.2/test_suite/test_suite.py (original) +++ 1.2/test_suite/test_suite.py Thu Mar 8 07:54:11 2007 @@ -295,8 +295,8 @@ sys.stdout.write("\n\n\n") self.heading("Results of the test suite") - # Flag for all tests. - self.global_pass = 1 + # Synopsis. + global_pass = 1 # Run tests. @@ -307,6 +307,10 @@ # Loop over the tests. for test in self.run_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -318,6 +322,10 @@ # Loop over the tests. for test in self.seq_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -329,6 +337,10 @@ # Loop over the tests. for test in self.diff_tensor_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -340,6 +352,10 @@ # Loop over the tests. for test in self.angles_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -351,6 +367,10 @@ # Loop over the tests. for test in self.relax_fit_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -362,6 +382,10 @@ # Loop over the tests. for test in self.mf_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -373,6 +397,10 @@ # Loop over the tests. for test in self.jw_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -384,6 +412,10 @@ # Loop over the tests. for test in self.modsel_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -395,6 +427,10 @@ # Loop over the tests. for test in self.generic_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. self.summary_line(test) @@ -409,7 +445,7 @@ sys.stdout.write(".") # Global pass. - if self.global_pass: + if global_pass: sys.stdout.write(" %-10s\n" % "[ OK ]") # Global fail.