From da28665bf030f2ceaa4f8246f3d1902ffc8e49b9 Mon Sep 17 00:00:00 2001 From: Ben Pastene Date: Fri, 10 Apr 2020 20:11:35 +0000 Subject: [PATCH] Manually roll chromite to pick up localhost vs VM fixes. Picks up a single change: $ git log 97d7f0702..8ef1e6c0 --date=short --first-parent --format='%ad %ae %s' 2020-04-06 bpastene@chromium.org device: Don't assume '--device=localhost' means VM. And updates chromeos/test_runner.py to not specify '--device=localhost' when running VM tests. Bug: 1067800 Change-Id: Id8af6b2cb1d8a082b71a6ac01cfe9522578a21b4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145762 Reviewed-by: Erik Chen Commit-Queue: Ben Pastene Cr-Original-Commit-Position: refs/heads/master@{#758264} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: a5301433ed9a9610c127691d6c0f6d4c4af82f7d --- chromeos/test_runner.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chromeos/test_runner.py b/chromeos/test_runner.py index fdbacd648..a0bff720b 100755 --- a/chromeos/test_runner.py +++ b/chromeos/test_runner.py @@ -109,8 +109,6 @@ class RemoteTest(object): '--start', # Don't persist any filesystem changes after the VM shutsdown. '--copy-on-write', - '--device', - 'localhost' ] else: self._test_cmd += [ @@ -706,8 +704,6 @@ def host_cmd(args, unknown_args): '--start', # Don't persist any filesystem changes after the VM shutsdown. '--copy-on-write', - '--device', - 'localhost', ] else: cros_run_test_cmd += [