r19169 - /branches/relax_disp/test_suite/system_tests/__init__.py -- March 27, 2013 - 12:12

Author: bugman
Date: Wed Mar 27 12:12:45 2013
New Revision: 19169

URL: http://svn.gna.org/viewcvs/relax?rev=19169&view=rev
Log:
Ported r8246 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8245:8246 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .

.....
  r8246 | semor | 2009-01-06 22:32:20 +0100 (Tue, 06 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/test_suite/system_tests/__init__.py
  
  Started to implement the framework for system tests.
.....


Modified:
    branches/relax_disp/test_suite/system_tests/__init__.py

Modified: branches/relax_disp/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/__init__.py?rev=19169&r1=19168&r2=19169&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/__init__.py (original)
+++ branches/relax_disp/test_suite/system_tests/__init__.py Wed Mar 27 
12:12:45 2013
@@ -57,6 +57,7 @@
 from test_suite.system_tests.pipes import Pipes
 from test_suite.system_tests.rdc import Rdc
 from test_suite.system_tests.relax_data import Relax_data
+from test_suite.system_tests.relax_disp import Relax_disp
 from test_suite.system_tests.relax_fit import Relax_fit
 from test_suite.system_tests.results import Results
 from test_suite.system_tests.selection import Selection
@@ -91,6 +92,7 @@
            'pipes',
            'rdc',
            'relax_data',
+           'relax_disp',
            'relax_fit',
            'results',
            'scripts',
@@ -179,6 +181,7 @@
             suite_array.append(TestLoader().loadTestsFromTestCase(Pipes))
             suite_array.append(TestLoader().loadTestsFromTestCase(Rdc))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Relax_data))
+            
suite_array.append(TestLoader().loadTestsFromTestCase(Relax_disp))
             suite_array.append(TestLoader().loadTestsFromTestCase(Relax_fit))
             suite_array.append(TestLoader().loadTestsFromTestCase(Results))
             suite_array.append(TestLoader().loadTestsFromTestCase(Selection))