android: Remove skylab-isms from test runner; support network devices
With some recent work in crbug.com/404887520, desktop DUTs hosted in
the CrOS lab now have a more consistent API. Namely: all DUTs have the
same hostname (but they'll resolve to different IPs on each bot).
So we can specify that single hostname in the testing specs for the
bots, and let the network magic resolve it as needed.
This lets us clean up a bunch of the skylab/swarming bits in the
android test runner.
This also makes the "connect over network" support a little more
generic, so someone should be able to use this test runner to run
tests on a device over the network.
The desktop tester will need both this and
https://crrev.com/i/8127885.
Bug: 404887520, 368004900
Change-Id: Id260855e760f07957beb2c7180ef271f791835eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6382279
Reviewed-by: Haiyang Pan <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Commit-Queue: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1437718}
diff --git a/build/android/test_runner.pydeps b/build/android/test_runner.pydeps
index 9fa8528..c041778b 100644
--- a/build/android/test_runner.pydeps
+++ b/build/android/test_runner.pydeps
@@ -181,12 +181,11 @@
pylib/local/__init__.py
pylib/local/device/__init__.py
pylib/local/device/local_device_environment.py
-pylib/local/device/local_device_ethernet_environment.py
pylib/local/device/local_device_gtest_run.py
pylib/local/device/local_device_instrumentation_test_run.py
pylib/local/device/local_device_monkey_test_run.py
+pylib/local/device/local_device_network_environment.py
pylib/local/device/local_device_test_run.py
-pylib/local/device/skylab_environment.py
pylib/local/emulator/__init__.py
pylib/local/emulator/avd.py
pylib/local/emulator/ini.py
