r20874 - in /branches/relax_disp: ./ test_suite/gui_tests/n_state_model.py -- September 06, 2013 - 10:21

Author: bugman
Date: Fri Sep  6 10:21:41 2013
New Revision: 20874

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

........
  r20873 | bugman | 2013-09-06 10:20:54 +0200 (Fri, 06 Sep 2013) | 9 lines
  
  Huge speed up of the GUI tests by the removal of the 
N_state_model.test_populations test.
  
  This problem was identified by running the GUI tests with the '--time' 
flag.  One one test machine,
  this single test took ~142 seconds to complete when the entire GUI tests 
took ~242 seconds (i.e.
  this one test took up to 60% of the whole test suite).  This test comes 
directly from a system test,
  but the equivalent system test only takes about 6 seconds to complete.  The 
difference is due to
  the slow generation of the user function GUI pages.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/gui_tests/n_state_model.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  6 10:21:41 2013
@@ -1,1 +1,1 @@
-/trunk:1-20811
+/trunk:1-20873

Modified: branches/relax_disp/test_suite/gui_tests/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/n_state_model.py?rev=20874&r1=20873&r2=20874&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/n_state_model.py (original)
+++ branches/relax_disp/test_suite/gui_tests/n_state_model.py Fri Sep  6 
10:21:41 2013
@@ -23,9 +23,25 @@
 """GUI tests for the N-state model related activities."""
 
 # relax module imports.
+from status import Status; status = Status()
 from test_suite.gui_tests.base_classes import GuiTestCase
 from test_suite import system_tests
 
 
 class N_state_model(GuiTestCase, system_tests.n_state_model.N_state_model):
     """Class for testing the N-state model related functions in the GUI."""
+
+    def __init__(self, methodName=None):
+        """Set up the test case class for the system tests."""
+
+        # Execute the base __init__ methods.
+        super(N_state_model, self).__init__(methodName)
+
+        # Tests to skip.
+        blacklist = [
+            'test_populations'
+        ]
+
+        # Skip the blacklisted tests.
+        if methodName in blacklist:
+            status.skipped_tests.append([methodName, None, self._skip_type])