r25848 - in /trunk/test_suite/system_tests: dasha.py palmer.py -- September 15, 2014 - 17:00

Author: bugman
Date: Mon Sep 15 17:00:53 2014
New Revision: 25848

URL: http://svn.gna.org/viewcvs/relax?rev=25848&view=rev
Log:
Shifted the checks for the Dasha and Modelfree4 software into the system test 
__init__() method.

This is to bring this into the same design as the relaxation dispersion tests 
which require the
NMRPipe showApod software.  Now the test suite will list either Dasha or 
Modelfree4 in the skipped
test table if they are not installed.


Modified:
    trunk/test_suite/system_tests/dasha.py
    trunk/test_suite/system_tests/palmer.py

Modified: trunk/test_suite/system_tests/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/dasha.py?rev=25848&r1=25847&r2=25848&view=diff
==============================================================================
--- trunk/test_suite/system_tests/dasha.py      (original)
+++ trunk/test_suite/system_tests/dasha.py      Mon Sep 15 17:00:53 2014
@@ -53,6 +53,12 @@
             # Store in the status object. 
             status.skipped_tests.append([methodName, 'subprocess', 
self._skip_type])
 
+        # Test for the presence of the Dasha binary (skip the test if not 
present).
+        try:
+            test_binary('dasha')
+        except:
+            status.skipped_tests.append([methodName, 'Dasha model-free 
software', self._skip_type])
+
 
     def setUp(self):
         """Set up for all the functional tests."""
@@ -66,12 +72,6 @@
 
     def test_dasha(self):
         """Test a complete model-free analysis using the program 'Dasha'."""
-
-        # Test for the presence of the Dasha binary (skip the test if not 
present).
-        try:
-            test_binary('dasha')
-        except:
-            return
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'dasha.py')

Modified: trunk/test_suite/system_tests/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/palmer.py?rev=25848&r1=25847&r2=25848&view=diff
==============================================================================
--- trunk/test_suite/system_tests/palmer.py     (original)
+++ trunk/test_suite/system_tests/palmer.py     Mon Sep 15 17:00:53 2014
@@ -54,22 +54,22 @@
             # Store in the status object. 
             status.skipped_tests.append([methodName, 'subprocess', 
self._skip_type])
 
-
-    def setUp(self):
-        """Set up for all the functional tests."""
-
-        # Create a temporary directory for ModelFree4 outputs.
-        ds.tmpdir = mkdtemp()
-
-
-    def test_palmer(self):
-        """Test a complete model-free analysis using the program 
'Modelfree4'."""
-
         # Test for the presence of the Modelfree4 binary (skip the test if 
not present).
         try:
             test_binary('modelfree4')
         except:
-            return
+            status.skipped_tests.append([methodName, "Art Palmer's 
Modelfree4 software", self._skip_type])
+
+
+    def setUp(self):
+        """Set up for all the functional tests."""
+
+        # Create a temporary directory for ModelFree4 outputs.
+        ds.tmpdir = mkdtemp()
+
+
+    def test_palmer(self):
+        """Test a complete model-free analysis using the program 
'Modelfree4'."""
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'palmer.py')
@@ -179,12 +179,6 @@
 
     def test_palmer_omp(self):
         """Test a complete model-free analysis using 'Modelfree4' with the 
OMP relaxation data, a PDB file, and a spheroid tensor."""
-
-        # Test for the presence of the Modelfree4 binary (skip the test if 
not present).
-        try:
-            test_binary('modelfree4')
-        except:
-            return
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'palmer_omp.py')