bluetooth: Change test control files to account for new naming convention
Bluetooth peers will be named hostname-btpeer going forward. This change
will enable to tests to use both old and new peer names
TEST=Ran tests locally and against lab DUTs
BUG=b:2058787
Cq-Depend:chromium:2058787
Change-Id: Ie82f118594d16fd6c7d18456358492290d87c942
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2061270
Commit-Queue: Shijin Abraham <shijinabraham@google.com>
Tested-by: Shijin Abraham <shijinabraham@google.com>
Reviewed-by: Daniel Winkler <danielwinkler@google.com>
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control b/server/site_tests/bluetooth_AdapterCLSanity/control
index d7b2191..2e11eee 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control
@@ -35,10 +35,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1)
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_keyboard_reports_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_keyboard_reports_test
index 69b0c1c..2c60be0 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_keyboard_reports_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_keyboard_reports_test
@@ -33,10 +33,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_reboot_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_reboot_test
index 041b604..98aa1c6 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_reboot_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_reboot_test
@@ -43,10 +43,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_suspend_resume_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_suspend_resume_test
index 7136ac2..daffeca 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_suspend_resume_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_suspend_resume_test
@@ -42,10 +42,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_test
index 1f784dd..931662a 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_HID_reports_test
@@ -40,10 +40,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_discovery_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_discovery_test
index 913ac37..a629070 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_discovery_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_discovery_test
@@ -25,10 +25,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_keyboard_pairing_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_keyboard_pairing_test
index a9d6b45..33036fd 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_keyboard_pairing_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_keyboard_pairing_test
@@ -37,10 +37,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_suspend_resume_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_suspend_resume_test
index f567d58..e88cd76 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_suspend_resume_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_suspend_resume_test
@@ -37,10 +37,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_test
index 98ce12c..729aa8a 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_test
@@ -37,10 +37,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_twice_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_twice_test
index b210d48..b1e6e47 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_twice_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_twice_test
@@ -37,10 +37,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_connect_disconnect_loop_test b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_connect_disconnect_loop_test
index af9fddc..9bcee71 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.cl_connect_disconnect_loop_test
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.cl_connect_disconnect_loop_test
@@ -31,10 +31,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterCLSanity/control.stress b/server/site_tests/bluetooth_AdapterCLSanity/control.stress
index 46d04fe..c46311d 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/control.stress
+++ b/server/site_tests/bluetooth_AdapterCLSanity/control.stress
@@ -35,10 +35,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterCLSanity', host=host,
num_iterations=15)
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_auto_reconnect b/server/site_tests/bluetooth_AdapterLESanity/control.le_auto_reconnect
index 9baff8a..eda2f99 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_auto_reconnect
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_auto_reconnect
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_connect_disconnect_loop b/server/site_tests/bluetooth_AdapterLESanity/control.le_connect_disconnect_loop
index ce6e2d7..8cd73f9 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_connect_disconnect_loop
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_connect_disconnect_loop
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_discovery_test b/server/site_tests/bluetooth_AdapterLESanity/control.le_discovery_test
index 47906cf..f30836a 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_discovery_test
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_discovery_test
@@ -25,10 +25,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_gatt_client_attribute_browse_test b/server/site_tests/bluetooth_AdapterLESanity/control.le_gatt_client_attribute_browse_test
index 6ccb5f2..6d31e66 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_gatt_client_attribute_browse_test
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_gatt_client_attribute_browse_test
@@ -24,10 +24,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_keyboard_reports b/server/site_tests/bluetooth_AdapterLESanity/control.le_keyboard_reports
index a8187ad..671dd3f 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_keyboard_reports
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_keyboard_reports
@@ -33,10 +33,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_mouse_reports b/server/site_tests/bluetooth_AdapterLESanity/control.le_mouse_reports
index 1817e75..96aebb0 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_mouse_reports
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_mouse_reports
@@ -42,10 +42,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.le_sanity b/server/site_tests/bluetooth_AdapterLESanity/control.le_sanity
index 9ec21d7..0f16fb1 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.le_sanity
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.le_sanity
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=1)
diff --git a/server/site_tests/bluetooth_AdapterLESanity/control.stress b/server/site_tests/bluetooth_AdapterLESanity/control.stress
index 7dc49bc..d444f33 100644
--- a/server/site_tests/bluetooth_AdapterLESanity/control.stress
+++ b/server/site_tests/bluetooth_AdapterLESanity/control.stress
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterLESanity', host=host,
num_iterations=15)
diff --git a/server/site_tests/bluetooth_AdapterMDSanity/control b/server/site_tests/bluetooth_AdapterMDSanity/control
index 3eeaaec..a44cfc7 100644
--- a/server/site_tests/bluetooth_AdapterMDSanity/control
+++ b/server/site_tests/bluetooth_AdapterMDSanity/control
@@ -30,10 +30,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterMDSanity', host=host,
num_iterations=1)
diff --git a/server/site_tests/bluetooth_AdapterMDSanity/control.md_two_connections_test b/server/site_tests/bluetooth_AdapterMDSanity/control.md_two_connections_test
index 3a553f5..7e02031 100644
--- a/server/site_tests/bluetooth_AdapterMDSanity/control.md_two_connections_test
+++ b/server/site_tests/bluetooth_AdapterMDSanity/control.md_two_connections_test
@@ -22,10 +22,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterMDSanity', host=host,
num_iterations=1, test_name=NAME.split('.')[1])
diff --git a/server/site_tests/bluetooth_AdapterMDSanity/control.stress b/server/site_tests/bluetooth_AdapterMDSanity/control.stress
index 0dcf952..0d9b677 100644
--- a/server/site_tests/bluetooth_AdapterMDSanity/control.stress
+++ b/server/site_tests/bluetooth_AdapterMDSanity/control.stress
@@ -30,10 +30,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterMDSanity', host=host,
num_iterations=15)
diff --git a/server/site_tests/bluetooth_AdapterQuickSanity/control.AVL b/server/site_tests/bluetooth_AdapterQuickSanity/control.AVL
index 903c536..ef0a3a3 100644
--- a/server/site_tests/bluetooth_AdapterQuickSanity/control.AVL
+++ b/server/site_tests/bluetooth_AdapterQuickSanity/control.AVL
@@ -22,10 +22,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterQuickSanity', host=host,
num_iterations=1, flag='AVL')
diff --git a/server/site_tests/bluetooth_AdapterQuickSanity/control.quick_sanity b/server/site_tests/bluetooth_AdapterQuickSanity/control.quick_sanity
index 6f301d7..77307a6 100644
--- a/server/site_tests/bluetooth_AdapterQuickSanity/control.quick_sanity
+++ b/server/site_tests/bluetooth_AdapterQuickSanity/control.quick_sanity
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterQuickSanity', host=host,
num_iterations=1, flag='Quick Sanity')
diff --git a/server/site_tests/bluetooth_AdapterQuickSanity/control.stress b/server/site_tests/bluetooth_AdapterQuickSanity/control.stress
index db8de34..934bfad 100644
--- a/server/site_tests/bluetooth_AdapterQuickSanity/control.stress
+++ b/server/site_tests/bluetooth_AdapterQuickSanity/control.stress
@@ -28,10 +28,17 @@
"""
args_dict = utils.args_to_dict(args)
+#
+# Bluetooth peers can be named hostname-<chameleon> or hostname-<btpeer[1-4]
+# Check for both until we transition to new peer names
+# TODO(b:149637050) Cleanup this code
+#
chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
+btpeer_args = hosts.CrosHost.get_btpeer_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, chameleon_args=chameleon_args)
+ host.initialize_btpeer(btpeer_args)
job.run_test('bluetooth_AdapterQuickSanity', host=host,
num_iterations=15)
