r22259 - in /branches/double_rotor: ./ test_suite/gui_tests/__init__.py test_suite/gui_tests/general.py -- February 24, 2014 - 09:52

Author: bugman
Date: Mon Feb 24 09:52:35 2014
New Revision: 22259

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

........
  r22258 | bugman | 2014-02-24 09:51:06 +0100 (Mon, 24 Feb 2014) | 7 lines
  
  Created the General.test_bug_21720_pipe_switching_with_tab_closure GUI test.
  
  This is to catch bug #21720 (https://gna.org/bugs/?21720), the failure to 
set the current data pipe
  in the GUI when the current and non-last analysis tab is closed.  The test 
replicates the steps as
  outlined in the bug report.
........

Added:
    branches/double_rotor/test_suite/gui_tests/general.py
      - copied unchanged from r22258, trunk/test_suite/gui_tests/general.py
Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/test_suite/gui_tests/__init__.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 24 09:52:35 2014
@@ -1,1 +1,1 @@
-/trunk:1-22256
+/trunk:1-22258

Modified: branches/double_rotor/test_suite/gui_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/gui_tests/__init__.py?rev=22259&r1=22258&r2=22259&view=diff
==============================================================================
--- branches/double_rotor/test_suite/gui_tests/__init__.py (original)
+++ branches/double_rotor/test_suite/gui_tests/__init__.py Mon Feb 24 
09:52:35 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -36,6 +36,7 @@
 from test_suite.gui_tests.consistency_tests import Ct
 from test_suite.gui_tests.dead_uf_pages import Dead_uf_pages
 from test_suite.gui_tests.frame_order import Frame_order
+from test_suite.gui_tests.general import General
 from test_suite.gui_tests.interatomic import Interatomic
 from test_suite.gui_tests.jw_mapping import Jw_mapping
 from test_suite.gui_tests.model_free import Mf
@@ -51,6 +52,7 @@
 
 __all__ = ['bmrb',
            'consistency_tests',
+           'gui',
            'interatomic',
            'jw_mapping',
            'model_free',
@@ -118,6 +120,7 @@
             suite_array.append(TestLoader().loadTestsFromTestCase(Ct))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Dead_uf_pages))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Frame_order))
+            suite_array.append(TestLoader().loadTestsFromTestCase(General))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Interatomic))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Jw_mapping))
             suite_array.append(TestLoader().loadTestsFromTestCase(Mf))