r16377 - in /branches/uf_redesign/test_suite: gui_tests/base_classes.py system_tests/base_classes.py system_tests/bmrb.py -- May 22, 2012 - 12:44

Author: bugman
Date: Tue May 22 12:44:06 2012
New Revision: 16377

URL: http://svn.gna.org/viewcvs/relax?rev=16377&view=rev
Log:
Eliminated the self._test_dir test class variable.

The system and GUI tests will now use the same script path.


Modified:
    branches/uf_redesign/test_suite/gui_tests/base_classes.py
    branches/uf_redesign/test_suite/system_tests/base_classes.py
    branches/uf_redesign/test_suite/system_tests/bmrb.py

Modified: branches/uf_redesign/test_suite/gui_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/base_classes.py?rev=16377&r1=16376&r2=16377&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/base_classes.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/base_classes.py Tue May 22 
12:44:06 2012
@@ -57,8 +57,7 @@
         # Execute the TestCase __init__ method.
         super(GuiTestCase, self).__init__(methodName)
 
-        # The directory where the tests are located, and a string used for 
classifying skipped tests.
-        self._test_dir = 'test_suite' + sep + 'gui_tests'
+        # A string used for classifying skipped tests.
         self._skip_type = 'gui'
 
         # Get the wx app, if the test suite is launched from the gui.

Modified: branches/uf_redesign/test_suite/system_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/base_classes.py?rev=16377&r1=16376&r2=16377&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/base_classes.py (original)
+++ branches/uf_redesign/test_suite/system_tests/base_classes.py Tue May 22 
12:44:06 2012
@@ -44,8 +44,7 @@
         # Execute the TestCase __init__ method.
         super(SystemTestCase, self).__init__(methodName)
 
-        # The directory where the tests are located, and a string used for 
classifying skipped tests.
-        self._test_dir = 'test_suite' + sep + 'system_tests'
+        # A string used for classifying skipped tests.
         self._skip_type = 'system'
 
         # Load the interpreter.

Modified: branches/uf_redesign/test_suite/system_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/bmrb.py?rev=16377&r1=16376&r2=16377&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/bmrb.py (original)
+++ branches/uf_redesign/test_suite/system_tests/bmrb.py Tue May 22 12:44:06 
2012
@@ -231,7 +231,7 @@
         ds.version = '3.0'
 
         # Execute the script.
-        self.script_exec(status.install_path + 
sep+self._test_dir+sep+'scripts'+sep+'bmrb_rw.py')
+        self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
         self.data_check(version='3.0')
@@ -244,7 +244,7 @@
         ds.version = '3.1'
 
         # Execute the script.
-        self.script_exec(status.install_path + 
sep+self._test_dir+sep+'scripts'+sep+'bmrb_rw.py')
+        self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
         self.data_check(version='3.1')