Author: bugman
Date: Sat Jan 5 21:02:22 2008
New Revision: 4368
URL: http://svn.gna.org/viewcvs/relax?rev=4368&view=rev
Log:
Removed all last remnants of the old system/functional test runner.
Removed:
1.3/test_suite/system_tests/main.py
Modified:
1.3/relax
1.3/test_suite/test_suite_runner.py
Modified: 1.3/relax
URL:
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=4368&r1=4367&r2=4368&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Sat Jan 5 21:02:22 2008
@@ -189,7 +189,6 @@
# Run the tests.
runner = Test_suite_runner(self)
- runner.run_old_system_tests()
runner.run_system_tests()
# Execute the relax unit tests.
Removed: 1.3/test_suite/system_tests/main.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/main.py?rev=4367&view=auto
==============================================================================
--- 1.3/test_suite/system_tests/main.py (original)
+++ 1.3/test_suite/system_tests/main.py (removed)
@@ -1,132 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2006-2007 Edward d'Auvergne
#
-#
#
-# This file is part of the program relax.
#
-#
#
-# relax is free software; you can redistribute it and/or modify
#
-# it under the terms of the GNU General Public License as published by
#
-# the Free Software Foundation; either version 2 of the License, or
#
-# (at your option) any later version.
#
-#
#
-# relax is distributed in the hope that it will be useful,
#
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
-# GNU General Public License for more details.
#
-#
#
-# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-#
#
-###############################################################################
-
-# Import statements.
-import traceback
-import sys
-
-# Formatting.
-from test_suite.formatting import *
-
-# Import the tests.
-
-
-class System_tests:
- """The system/functional tests component of the relax test suite."""
-
- def __init__(self, relax):
- """The relax system/functional tests.
-
- This class runs a number of tests to determine if any changes to
relax have caused
- breakages.
- """
-
- self.relax = relax
-
-
- def run(self):
- """Method for the execution of all system/functional tests."""
-
- # Introduction.
- ###############
-
- # Heading.
- heading("The relax test suite")
-
-
- # Fin.
- ######
-
- global_pass = self.summary()
- return global_pass
-
-
- def exec_tests(self, test_array):
- """Function for running the tests."""
-
- # Loop over the tests.
- for i in xrange(len(test_array)):
- # Print out.
- string = "# Executing the test of " + test_array[i].name + '.'
- sys.stdout.write(string + '\n')
- for j in range(len(string)):
- sys.stdout.write('#')
- sys.stdout.write("\n\n")
-
- # Reset relax.
- self.relax.interpreter._Reset.reset()
-
- # The data pipe name, used by many tests.
- self.pipe = 'test'
-
- # Flag indicating whether the test passed or failed.
- test_array[i].passed = 0
-
- # Execute the test.
- try:
- test_array[i].passed = test_array[i].test(self.pipe)
-
- # The test failed.
- except:
- traceback.print_exc()
-
- # Print out.
- sys.stdout.write("\n\n\n\n\n\n\n")
-
- # Debugging.
- if not test_array[i].passed and self.relax.Debug:
- sys.exit()
-
-
- def summary(self):
- """Function for printing out a summary of all tests."""
-
- # Heading.
- sys.stdout.write("\n\n\n")
- heading("Results of the test suite")
-
- # Synopsis.
- global_pass = 1
-
-
- # Synposis.
- ###########
-
- # Global pass print out.
- sys.stdout.write("\n\n\nSynopsis ")
-
- # Dots.
- for j in xrange(88 - len("Synopsis")):
- sys.stdout.write(".")
-
- # Global pass.
- if global_pass:
- sys.stdout.write(" %-10s\n" % "[ OK ]")
-
- # Global fail.
- else:
- sys.stdout.write(" %-10s\n" % "[ Failed ]")
- sys.stdout.write("\n\n")
-
-
- # Return the global_pass value.
- return global_pass
Modified: 1.3/test_suite/test_suite_runner.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/test_suite_runner.py?rev=4368&r1=4367&r2=4368&view=diff
==============================================================================
--- 1.3/test_suite/test_suite_runner.py (original)
+++ 1.3/test_suite/test_suite_runner.py Sat Jan 5 21:02:22 2008
@@ -24,7 +24,6 @@
from formatting import heading, summary_line
# Import the test suite categories.
-from system_tests.main import System_tests
from system_tests import System_test_runner
from unit_tests.unit_test_runner import Unit_test_runner
@@ -53,9 +52,6 @@
def run_all_tests(self):
"""Execute all of the test suite test types."""
- # Execute the old system/functional tests.
- self.run_old_system_tests()
-
# Execute the system/functional tests.
self.run_system_tests()
@@ -64,17 +60,6 @@
# Print out a summary of the test suite.
self.summary()
-
-
- def run_old_system_tests(self):
- """Function for executing the old style system/functional tests."""
-
- # Print a header.
- heading('Old system / functional tests')
-
- # Run the tests.
- sys_runner = System_tests(self.relax)
- self.system_result_old = sys_runner.run()
def run_system_tests(self):
@@ -108,9 +93,6 @@
print "# Summary of the relax test suite #"
print "###################################\n"
- # Old system/functional test summary.
- summary_line("Old system/functional tests", self.system_result_old)
-
# System/functional test summary.
summary_line("System/functional tests", self.system_result)
@@ -118,4 +100,4 @@
summary_line("Unit tests", self.unit_result)
# Synopsis.
- summary_line("Synopsis", self.system_result_old and
self.system_result and self.unit_result)
+ summary_line("Synopsis", self.system_result and self.unit_result)
r4368 - in /1.3: relax test_suite/system_tests/main.py test_suite/test_suite_runner.py