Chromium Code Reviews| Index: testing/legion/examples/subprocess/subprocess_test.py |
| diff --git a/testing/legion/examples/subprocess/subprocess_test.py b/testing/legion/examples/subprocess/subprocess_test.py |
| index 037780035e346b19ccafddac3b98d3a5097d4017..9b1479de5e8f5cc119f6f1f3760f3aa02f4209e6 100755 |
| --- a/testing/legion/examples/subprocess/subprocess_test.py |
| +++ b/testing/legion/examples/subprocess/subprocess_test.py |
| @@ -32,7 +32,7 @@ class ExampleTestController(test_controller.TestController): |
| self.task = self.CreateNewTask( |
| isolated_hash=args.task_hash, |
| - dimensions={'os': 'Ubuntu-14.04', 'pool': 'Legion'}, |
| + dimensions={'os': 'Ubuntu-14.04', 'pool': 'Chromoting'}, |
|
Mike Meade
2015/03/06 17:18:43
We merged the Legion machines in with the Chromoti
|
| idle_timeout_secs=90, connection_timeout_secs=90, |
| verbosity=logging.DEBUG) |
| self.task.Create() |
| @@ -64,11 +64,13 @@ class ExampleTestController(test_controller.TestController): |
| def TestTerminate(self): |
| start = time.time() |
| proc = self.task.rpc.subprocess.Popen(['sleep', '20']) |
| - self.task.rpc.subprocess.Terminate(proc) # Implicitly deleted |
| + self.task.rpc.subprocess.Terminate(proc) |
| try: |
| self.task.rpc.subprocess.Wait(proc) |
| except xmlrpclib.Fault: |
| pass |
| + finally: |
| + self.task.rpc.subprocess.Delete(proc) |
| assert time.time() - start < 20 |
| def TestLs(self): |