r20745 - in /branches/relax_disp: ./ test_suite/shared_data/model_free/bug_21079_local_tm_global_selection/ test_suite/syste... -- September 02, 2013 - 14:51

Author: bugman
Date: Mon Sep  2 14:51:36 2013
New Revision: 20745

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

........
  r20741 | bugman | 2013-09-02 14:12:14 +0200 (Mon, 02 Sep 2013) | 5 lines
  
  Created the Mf.test_bug_21079_local_tm_global_selection system test.
  
  This is to catch bug #21079 (https://gna.org/bugs/?21079).
........

Added:
    
branches/relax_disp/test_suite/shared_data/model_free/bug_21079_local_tm_global_selection/
      - copied from r20741, 
trunk/test_suite/shared_data/model_free/bug_21079_local_tm_global_selection/
    
branches/relax_disp/test_suite/system_tests/scripts/model_free/bug_21079_local_tm_global_selection.py
      - copied unchanged from r20741, 
trunk/test_suite/system_tests/scripts/model_free/bug_21079_local_tm_global_selection.py
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/system_tests/model_free.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep  2 14:51:36 2013
@@ -1,1 +1,1 @@
-/trunk:1-20739
+/trunk:1-20739,20741

Modified: branches/relax_disp/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/model_free.py?rev=20745&r1=20744&r2=20745&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/model_free.py (original)
+++ branches/relax_disp/test_suite/system_tests/model_free.py Mon Sep  2 
14:51:36 2013
@@ -470,6 +470,13 @@
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_20683_bdc_inf_values.py')
+
+
+    def test_bug_21079_local_tm_global_selection(self):
+        """Test catching U{bug #21079<https://gna.org/bugs/?21079>}, the 
local tm global model selection."""
+
+        # Execute the script.
+        self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_21079_local_tm_global_selection.py')
 
 
     def test_create_m4(self):