Closedown

plugins/TestingList.java

@@ -960,9 +960,12 @@ public class TestingList extends Panel {
                         }
                     }
                     System.out.println(sParallelizeCommand);
-                    Object ret = eval("globals = globals()");
-                    ret = eval("locals = locals()");
-                    ret = eval(sParallelizeCommand);
+                    //Object ret = eval("globals = globals()");
+                    System.out.println("a");
+                    //ret = eval("locals = 'a'; locals()");
+                    System.out.println("b");
+                    Object ret = eval(sParallelizeCommand);
+                    System.out.println("c");
 //                    Object ret = eval("parallelize((run,(str('"+sTestPath+"'),)), (run,('Motor Test 3 200ms',)))");
                     //System.out.println("Ret = " + String.valueOf(ret));
                     String sTestResult, sTestStatus;

script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py

@@ -1,5 +1,6 @@
 #Script Motor Test 2
 #Go to absolute position A, then move +B steps, then -2B steps, then +2Bsteps (ie oscillate round centre position, logging after each movement); repeat N times 
+import sys, inspect, os, traceback
 
 ###### DO NOT MODIFY THE CODE BELOW ######
 def startTest(testName, DEVICE, params):
@@ -196,7 +197,7 @@ def print_log(testName, DEVICE, text):
     now = time.strftime('%Y.%m.%d %H:%M:%S') 
     print now + ' ' + DEVICE + ' - ' + testName + ': ' + text
     
-import sys, inspect, os, traceback
+
 #get test arguments
 DEVICE = device
 testName = test