r12327 - in /branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting: main.py sub.py -- January 13, 2011 - 16:46

Author: bugman
Date: Thu Jan 13 16:46:09 2011
New Revision: 12327

URL: http://svn.gna.org/viewcvs/relax?rev=12327&view=rev
Log:
Bug fix for the nested scripting test for certain python versions.

The sys.path list is not consistent between python versions, so the full path 
of the scripts is used
to execute them.


Modified:
    
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/main.py
    branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/sub.py

Modified: 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/main.py?rev=12327&r1=12326&r2=12327&view=diff
==============================================================================
--- 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/main.py 
(original)
+++ 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/main.py 
Thu Jan 13 16:46:09 2011
@@ -1,5 +1,12 @@
+# Python module imports.
+from os import sep
+
+# relax module imports.
+from status import Status; status = Status()
+
 pipe.create('a', 'mf')
 cdp.nest = []
-script('sub.py')
-script('c.py')
-script('d.py')
+path = status.install_path + sep + 'test_suite' + sep + 'system_tests' + sep 
+ 'scripts' + sep + 'nested_scripting' + sep
+script(path + 'sub.py')
+script(path + 'c.py')
+script(path + 'd.py')

Modified: 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/sub.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/sub.py?rev=12327&r1=12326&r2=12327&view=diff
==============================================================================
--- 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/sub.py 
(original)
+++ 
branches/bieri_gui/test_suite/system_tests/scripts/nested_scripting/sub.py 
Thu Jan 13 16:46:09 2011
@@ -1,2 +1,9 @@
-script('a.py')
-script('b.py')
+# Python module imports.
+from os import sep
+
+# relax module imports.
+from status import Status; status = Status()
+
+path = status.install_path + sep + 'test_suite' + sep + 'system_tests' + sep 
+ 'scripts' + sep + 'nested_scripting' + sep
+script(path + 'a.py')
+script(path + 'b.py')