bluetooth: Add Remaining Multi-Device tests for floss

This adds the remaining multi-device tests for floss and verified that
they pass.

BUG=b:216352373
TEST=on zork, test_that bluetooth_AdapterMDHealth.*.floss

Change-Id: I75ef8aa4b99ca9e39f7d62c83bb091d4d6bfa2c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3651186
Tested-by: Sonny Sasaka <sonnysasaka@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Commit-Queue: Sonny Sasaka <sonnysasaka@chromium.org>

3 files changed, 75 insertions, 2 deletions

diff --git a/server/site_tests/bluetooth_AdapterMDHealth/bluetooth_AdapterMDHealth.py b/server/site_tests/bluetooth_AdapterMDHealth/bluetooth_AdapterMDHealth.py
index d81af75ccc..d18414222b 100644
--- a/server/site_tests/bluetooth_AdapterMDHealth/bluetooth_AdapterMDHealth.py
+++ b/server/site_tests/bluetooth_AdapterMDHealth/bluetooth_AdapterMDHealth.py
@@ -79,7 +79,11 @@ class bluetooth_AdapterMDHealth(BluetoothAdapterQuickTests,
 
 
     @test_wrapper('Two BLE connections',
-                  devices={'BLE_MOUSE':1, 'BLE_KEYBOARD':1})
+                  devices={
+                          'BLE_MOUSE': 1,
+                          'BLE_KEYBOARD': 1
+                  },
+                  supports_floss=True)
     def md_two_ble_hid_connections_test(self):
         """ test whether DUT can connect to ble keyboard and ble mouse at the
             same time
@@ -92,7 +96,12 @@ class bluetooth_AdapterMDHealth(BluetoothAdapterQuickTests,
         self.pair_and_test_connection(devices)
 
 
-    @test_wrapper('Two classic connections', devices={'MOUSE':1, 'KEYBOARD':1})
+    @test_wrapper('Two classic connections',
+                  devices={
+                          'MOUSE': 1,
+                          'KEYBOARD': 1
+                  },
+                  supports_floss=True)
     def md_two_cl_hid_connections_test(self):
         """ test whether DUT can connect to classic mouse and classic keyboard
             at the same time
diff --git a/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_ble_hid_connections_test.floss b/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_ble_hid_connections_test.floss
new file mode 100644
index 0000000000..704ae49050
--- /dev/null
+++ b/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_ble_hid_connections_test.floss
@@ -0,0 +1,32 @@
+# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = 'chromeos-bluetooth'
+NAME = 'bluetooth_AdapterMDHealth.md_two_ble_hid_connections_test.floss'
+PURPOSE = ('Verify DUT can connect to both devices')
+CRITERIA = 'DUT can connect to both devices'
+ATTRIBUTES = 'suite:bluetooth_floss'
+TIME = 'SHORT'
+TEST_CATEGORY = 'Functional'
+TEST_CLASS = 'bluetooth'
+TEST_TYPE = 'server'
+DEPENDENCIES = 'bluetooth, working_bluetooth_btpeer:2'
+PY_VERSION = 3
+
+DOC = """
+    This test is to verify that DUT can connect BLE keyboard and
+    BLE mouse at the same time.
+    """
+
+args_dict = utils.args_to_dict(args)
+
+def run(machine):
+    host = hosts.create_host(machine)
+    job.run_test('bluetooth_AdapterMDHealth', host=host,
+                 num_iterations=1, args_dict=args_dict,
+                 test_name=NAME.split('.')[1], floss=True)
+
+parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_cl_hid_connections_test.floss b/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_cl_hid_connections_test.floss
new file mode 100644
index 0000000000..479ccb192b
--- /dev/null
+++ b/server/site_tests/bluetooth_AdapterMDHealth/control.md_two_cl_hid_connections_test.floss
@@ -0,0 +1,32 @@
+# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = 'chromeos-bluetooth'
+NAME = 'bluetooth_AdapterMDHealth.md_two_cl_hid_connections_test.floss'
+PURPOSE = ('Verify DUT can connect to both devices')
+CRITERIA = 'DUT can connect to both devices'
+ATTRIBUTES = 'suite:bluetooth_floss'
+TIME = 'SHORT'
+TEST_CATEGORY = 'Functional'
+TEST_CLASS = 'bluetooth'
+TEST_TYPE = 'server'
+DEPENDENCIES = 'bluetooth, working_bluetooth_btpeer:2'
+PY_VERSION = 3
+
+DOC = """
+    This test is to verify that DUT can connect classic keyboard and
+    classic mouse at the same time.
+    """
+
+args_dict = utils.args_to_dict(args)
+
+def run(machine):
+    host = hosts.create_host(machine)
+    job.run_test('bluetooth_AdapterMDHealth', host=host,
+                 num_iterations=1, args_dict=args_dict,
+                 test_name=NAME.split('.')[1], floss=True)
+
+parallel_simple(run, machines)