diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-27 08:59:00 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-27 08:59:00 -0800 |
| commit | ef6938477b5019fea4f0ed7da06cc1f974f29438 (patch) | |
| tree | 7501942df052fa4d983a3f2f4b0adaf99be317c8 /tools/run_tests/run_stress_tests.py | |
| parent | 9a66ba5fe9b0714f2b48c6d3848d9716cdf85b91 (diff) | |
| parent | 702f93d3645055bd77181935c18f41a9de272c1e (diff) | |
Merge branch 'slice_with_exec_ctx' into metadata_filter
Diffstat (limited to 'tools/run_tests/run_stress_tests.py')
| -rwxr-xr-x | tools/run_tests/run_stress_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/run_tests/run_stress_tests.py b/tools/run_tests/run_stress_tests.py index de4a22877c..a94a615b88 100755 --- a/tools/run_tests/run_stress_tests.py +++ b/tools/run_tests/run_stress_tests.py @@ -33,9 +33,7 @@ from __future__ import print_function import argparse import atexit -import dockerjob import itertools -import jobset import json import multiprocessing import os @@ -46,6 +44,9 @@ import tempfile import time import uuid +import python_utils.dockerjob as dockerjob +import python_utils.jobset as jobset + # Docker doesn't clean up after itself, so we do it on exit. atexit.register(lambda: subprocess.call(['stty', 'echo'])) |