r20044 - in /branches/relax_disp: ./ test_suite/relax_test_runner.py test_suite/system_tests/noe.py -- June 11, 2013 - 18:06

Author: bugman
Date: Tue Jun 11 18:06:25 2013
New Revision: 20044

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

........
  r20039 | bugman | 2013-06-11 17:29:51 +0200 (Tue, 11 Jun 2013) | 5 lines
  
  Fix for the Noe.test_noe_analysis system test.
  
  This is needed due to the Grace graph autoscaling changes of r20037.
........
  r20041 | bugman | 2013-06-11 17:43:27 +0200 (Tue, 11 Jun 2013) | 6 lines
  
  Bug fix for the running of the test suite in the relax GUI.
  
  The fix of r19727 was extended to apply to the GUI as well.  Too many 
arguments were being sent into
  TextTestRunner Python class on certain Python versions (3.1 and <= 2.6).
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/relax_test_runner.py
    branches/relax_disp/test_suite/system_tests/noe.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 11 18:06:25 2013
@@ -1,1 +1,1 @@
-/trunk:1-20037
+/trunk:1-20043

Modified: branches/relax_disp/test_suite/relax_test_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/relax_test_runner.py?rev=20044&r1=20043&r2=20044&view=diff
==============================================================================
--- branches/relax_disp/test_suite/relax_test_runner.py (original)
+++ branches/relax_disp/test_suite/relax_test_runner.py Tue Jun 11 18:06:25 
2013
@@ -231,7 +231,10 @@
         """
 
         # Execute the base method.
-        super(GuiTestRunner, self).__init__(stream=stream, 
descriptions=descriptions, verbosity=verbosity, failfast=failfast, 
buffer=buffer, resultclass=resultclass)
+        if (sys.version_info[0] == 3 and sys.version_info[1] == 1) or 
(sys.version_info[0] == 2 and sys.version_info[1] <= 6):
+            super(GuiTestRunner, self).__init__(stream=stream, 
descriptions=descriptions, verbosity=verbosity)
+        else:
+            super(GuiTestRunner, self).__init__(stream=stream, 
descriptions=descriptions, verbosity=verbosity, failfast=failfast, 
buffer=buffer, resultclass=resultclass)
 
         # Store the flag.
         self.timing_flag = timing

Modified: branches/relax_disp/test_suite/system_tests/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/noe.py?rev=20044&r1=20043&r2=20044&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/noe.py (original)
+++ branches/relax_disp/test_suite/system_tests/noe.py Tue Jun 11 18:06:25 
2013
@@ -79,8 +79,6 @@
             '@page size 842, 595\n',
             '@with g0\n',
             '@    view 0.15, 0.15, 1.28, 0.85\n',
-            '@    world xmin 0\n',
-            '@    world xmax 166\n',
             '@    xaxis  label "Residue number"\n',
             '@    xaxis  label char size 1.48\n',
             '@    xaxis  tick major size 0.75\n',
@@ -121,7 +119,8 @@
             '@target G0.S1\n',
             '@type xydy\n',
             '40                             -0.670738797320466             
0.014260663438353             \n',
-            '&\n'
+            '&\n',
+            '@autoscale\n'
         ]
 
         # Check the Grace file.