r18154 - in /branches/frame_order_testing: ./ test_suite/system_tests/__init__.py test_suite/system_tests/selection.py -- December 17, 2012 - 18:44

Author: bugman
Date: Mon Dec 17 18:44:19 2012
New Revision: 18154

URL: http://svn.gna.org/viewcvs/relax?rev=18154&view=rev
Log:
Merged revisions 18153 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18153 | bugman | 2012-12-17 18:42:13 +0100 (Mon, 17 Dec 2012) | 7 lines
  
  Created the Selection system test class.
  
  This currently has the test Selection.test_deselect_all for checking the 
deselect.all user function.
  The number of tests will be expanded in the future to cover interatomic 
data containers and the
  operation of all the select and deselect user functions.
........

Added:
    branches/frame_order_testing/test_suite/system_tests/selection.py
      - copied unchanged from r18153, 
trunk/test_suite/system_tests/selection.py
Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/test_suite/system_tests/__init__.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 17 18:44:19 2012
@@ -1,1 +1,1 @@
-/trunk:1-18151
+/trunk:1-18153

Modified: branches/frame_order_testing/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/__init__.py?rev=18154&r1=18153&r2=18154&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/__init__.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/__init__.py Mon Dec 
17 18:44:19 2012
@@ -59,6 +59,7 @@
 from test_suite.system_tests.relax_data import Relax_data
 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
 from test_suite.system_tests.sequence import Sequence
 from test_suite.system_tests.state import State
 from test_suite.system_tests.structure import Structure
@@ -93,6 +94,7 @@
            'relax_fit',
            'results',
            'scripts',
+           'selection',
            'sequence',
            'state',
            'structure',
@@ -179,6 +181,7 @@
             
suite_array.append(TestLoader().loadTestsFromTestCase(Relax_data))
             suite_array.append(TestLoader().loadTestsFromTestCase(Relax_fit))
             suite_array.append(TestLoader().loadTestsFromTestCase(Results))
+            suite_array.append(TestLoader().loadTestsFromTestCase(Selection))
             suite_array.append(TestLoader().loadTestsFromTestCase(Sequence))
             suite_array.append(TestLoader().loadTestsFromTestCase(State))
             suite_array.append(TestLoader().loadTestsFromTestCase(Structure))