Author: bugman Date: Fri Dec 17 15:03:00 2010 New Revision: 11865 URL: http://svn.gna.org/viewcvs/relax?rev=11865&view=rev Log: Added a system test for nested scripting. Added: 1.3/test_suite/system_tests/scripts/nested_scripting/ 1.3/test_suite/system_tests/scripts/nested_scripting/a.py 1.3/test_suite/system_tests/scripts/nested_scripting/b.py 1.3/test_suite/system_tests/scripts/nested_scripting/c.py 1.3/test_suite/system_tests/scripts/nested_scripting/d.py 1.3/test_suite/system_tests/scripts/nested_scripting/main.py 1.3/test_suite/system_tests/scripts/nested_scripting/sub.py Modified: 1.3/test_suite/system_tests/generic.py Modified: 1.3/test_suite/system_tests/generic.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/generic.py?rev=11865&r1=11864&r2=11865&view=diff ============================================================================== --- 1.3/test_suite/system_tests/generic.py (original) +++ 1.3/test_suite/system_tests/generic.py Fri Dec 17 15:03:00 2010 @@ -40,6 +40,16 @@ ds.__reset__() + def test_nested_scripting(self): + """Test nested scripting.""" + + # Execute the script. + self.interpreter.run(script_file=__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'nested_scripting'+sep+'main.py') + + # Check. + self.assertEqual(cdp.nest, ['a', 'b', 'c', 'd']) + + def test_value_diff(self): """S2 difference stored in a new data pipe.""" Added: 1.3/test_suite/system_tests/scripts/nested_scripting/a.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/a.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/a.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/a.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,1 @@ +cdp.nest.append("a") Added: 1.3/test_suite/system_tests/scripts/nested_scripting/b.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/b.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/b.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/b.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,1 @@ +cdp.nest.append("b") Added: 1.3/test_suite/system_tests/scripts/nested_scripting/c.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/c.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/c.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/c.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,1 @@ +cdp.nest.append("c") Added: 1.3/test_suite/system_tests/scripts/nested_scripting/d.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/d.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/d.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/d.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,1 @@ +cdp.nest.append("d") Added: 1.3/test_suite/system_tests/scripts/nested_scripting/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/main.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/main.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/main.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,4 @@ +cdp.nest = [] +script('sub.py') +script('c.py') +script('d.py') Added: 1.3/test_suite/system_tests/scripts/nested_scripting/sub.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/nested_scripting/sub.py?rev=11865&view=auto ============================================================================== --- 1.3/test_suite/system_tests/scripts/nested_scripting/sub.py (added) +++ 1.3/test_suite/system_tests/scripts/nested_scripting/sub.py Fri Dec 17 15:03:00 2010 @@ -1,0 +1,2 @@ +script('a.py') +script('b.py')