autotest: remove testbed_suite from test_push
BUG=chromium:743077
TEST=test_push_unittest
Change-Id: I679ccd4555350946037a3b281672ab553d224388
Reviewed-on: https://chromium-review.googlesource.com/572061
Tested-by: Aviv Keshet <akeshet@chromium.org>
Trybot-Ready: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Xixuan Wu <xixuan@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>
diff --git a/site_utils/test_push.py b/site_utils/test_push.py
index af579fb..b698fe3 100755
--- a/site_utils/test_push.py
+++ b/site_utils/test_push.py
@@ -67,7 +67,6 @@
RUN_SUITE_COMMAND = 'run_suite.py'
PUSH_TO_PROD_SUITE = 'push_to_prod'
DUMMY_SUITE = 'dummy'
-TESTBED_SUITE = 'testbed_push'
# TODO(shuqianz): Dynamically get android build after crbug.com/646068 fixed
DEFAULT_TIMEOUT_MIN_FOR_SUITE_JOB = 30
IMAGE_BUCKET = CONFIG.get_config_value('CROS', 'image_storage_server')
@@ -619,17 +618,8 @@
asynchronous_suite.daemon = True
asynchronous_suite.start()
- # Test suite for testbed
- testbed_suite = multiprocessing.Process(
- target=test_suite_wrapper,
- args=(queue, TESTBED_SUITE, EXPECTED_TEST_RESULTS_TESTBED,
- arguments, False, False, True))
- testbed_suite.daemon = use_daemon
- testbed_suite.start()
-
while (push_to_prod_suite.is_alive()
- or asynchronous_suite.is_alive()
- or testbed_suite.is_alive()):
+ or asynchronous_suite.is_alive()):
check_queue(queue)
time.sleep(5)
@@ -637,7 +627,6 @@
push_to_prod_suite.join()
asynchronous_suite.join()
- testbed_suite.join()
# All tests pass, push prod-next branch for UPDATED_REPOS.
push_prod_next_branch(updated_repo_heads)