Bluetooth: enable suites for nightly runs
Fix the SDP test to use the right suite declaration, add wificell to all
dependencies, and use the -router hostname style to match the wificell
setup.
BUG=chromium:346989
TEST=verify suites are running
Change-Id: I8cbd06d46b15e8fb8d47325b4e0f80911f65123b
Reviewed-on: https://chromium-review.googlesource.com/187953
Reviewed-by: Alex Miller <milleral@chromium.org>
Tested-by: Scott James Remnant <keybuk@chromium.org>
Commit-Queue: Scott James Remnant <keybuk@chromium.org>
diff --git a/server/cros/bluetooth/bluetooth_tester.py b/server/cros/bluetooth/bluetooth_tester.py
index a23f7f5..270aa1b 100644
--- a/server/cros/bluetooth/bluetooth_tester.py
+++ b/server/cros/bluetooth/bluetooth_tester.py
@@ -150,7 +150,7 @@
device_hostname = device_host.hostname
parts = device_hostname.split('.')
- parts[0] = parts[0] + '-bluetooth'
+ parts[0] = parts[0] + '-router'
tester_hostname = '.'.join(parts)
return hosts.create_host(tester_hostname)
diff --git a/server/site_tests/bluetooth_SDP_ServiceSearchRequestBasic/control b/server/site_tests/bluetooth_SDP_ServiceSearchRequestBasic/control
index 70335ef..46a25fd 100644
--- a/server/site_tests/bluetooth_SDP_ServiceSearchRequestBasic/control
+++ b/server/site_tests/bluetooth_SDP_ServiceSearchRequestBasic/control
@@ -4,11 +4,11 @@
AUTHOR = 'arakhov@chromium.org'
NAME = 'bluetooth_SDP_ServiceSearchRequestBasic'
-SUITE = 'bluetooth,bluetooth_sdp'
+SUITE = 'bluetooth,bluetooth_qualification'
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify the correct behaviour of the device when searching for services.
diff --git a/server/site_tests/bluetooth_Sanity_AdapterPresent/control b/server/site_tests/bluetooth_Sanity_AdapterPresent/control
index 02c2ad4..3e91ae8 100644
--- a/server/site_tests/bluetooth_Sanity_AdapterPresent/control
+++ b/server/site_tests/bluetooth_Sanity_AdapterPresent/control
@@ -8,7 +8,7 @@
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify that the device has a Bluetooth adapter and that it's visible to both
diff --git a/server/site_tests/bluetooth_Sanity_DefaultState/control b/server/site_tests/bluetooth_Sanity_DefaultState/control
index c9da507..c44d1ec 100644
--- a/server/site_tests/bluetooth_Sanity_DefaultState/control
+++ b/server/site_tests/bluetooth_Sanity_DefaultState/control
@@ -8,7 +8,7 @@
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify that the device's Bluetooth adapter has the correct default state when
diff --git a/server/site_tests/bluetooth_Sanity_Discoverable/control b/server/site_tests/bluetooth_Sanity_Discoverable/control
index fc7e3b4..76e3c2c 100644
--- a/server/site_tests/bluetooth_Sanity_Discoverable/control
+++ b/server/site_tests/bluetooth_Sanity_Discoverable/control
@@ -8,7 +8,7 @@
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify that the device can be discovered from another Bluetooth device.
diff --git a/server/site_tests/bluetooth_Sanity_Discovery/control b/server/site_tests/bluetooth_Sanity_Discovery/control
index 6f8c471..a524492 100644
--- a/server/site_tests/bluetooth_Sanity_Discovery/control
+++ b/server/site_tests/bluetooth_Sanity_Discovery/control
@@ -8,7 +8,7 @@
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify that the device can discover another Bluetooth device.
diff --git a/server/site_tests/bluetooth_Sanity_ValidAddress/control b/server/site_tests/bluetooth_Sanity_ValidAddress/control
index 8c6022b..222bb13 100644
--- a/server/site_tests/bluetooth_Sanity_ValidAddress/control
+++ b/server/site_tests/bluetooth_Sanity_ValidAddress/control
@@ -8,7 +8,7 @@
TIME = 'SHORT'
TEST_CLASS = 'bluetooth'
TEST_TYPE = 'Server'
-DEPENDENCIES = 'bluetooth'
+DEPENDENCIES = 'bluetooth,wificell'
DOC = """
Verify that the device's Bluetooth adapter has a valid address.
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index b1f9a7b..5bb274f 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -277,3 +277,16 @@
suite: security_weekly
branch_specs: >=R30
pool: suites
+
+[Bluetooth_Qualification]
+run_on: nightly
+suite: bluetooth_qualification
+branch_specs: >=R34
+pool: wificell
+
+[Bluetooth_Sanity]
+run_on: nightly
+suite: bluetooth_sanity
+branch_specs: >=R34
+pool: wificell
+