commit df10e14361dff59f4ad606426f522865f3ff661a
author Shijin Abraham <shijinabraham@google.com> Mon Dec 23 13:12:24 2019 -0800
committer Commit Bot <commit-bot@chromium.org> Sat Jan 04 03:37:52 2020 +0000
tree f9990ea1357fc43a52f73e8f7bdcd408eaacf85a
parent b47a69db3d48eac8bcffecbbf6b07ffba1dd3409

bluetooth autotest: Add pairing twice test.

TEST=Ran bluetooth_AdapterCL_Sanity of RPI/Fizz
BUG=b:145158271

Change-Id: Ie844af48e60d70367037f2f3287149f52d7b9b7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1980933
Tested-by: Shijin Abraham <shijinabraham@google.com>
Auto-Submit: Shijin Abraham <shijinabraham@google.com>
Reviewed-by: Daniel Winkler <danielwinkler@google.com>
Commit-Queue: Daniel Winkler <danielwinkler@google.com>

server/site_tests/bluetooth_AdapterCLSanity/bluetooth_AdapterCLSanity.py

diff --git a/server/site_tests/bluetooth_AdapterCLSanity/bluetooth_AdapterCLSanity.py b/server/site_tests/bluetooth_AdapterCLSanity/bluetooth_AdapterCLSanity.py
index ff99ea0..b134403 100644
--- a/server/site_tests/bluetooth_AdapterCLSanity/bluetooth_AdapterCLSanity.py
+++ b/server/site_tests/bluetooth_AdapterCLSanity/bluetooth_AdapterCLSanity.py
@@ -65,6 +65,16 @@
                           suspend_resume=True)
 
 
+    @test_wrapper('Pairing Twice Test', devices={"MOUSE":1})
+    def cl_adapter_pairing_twice_test(self):
+        """Performs pairing twice test with  mouse peripheral"""
+        device = self.devices['MOUSE'][0]
+        self.pairing_test(device,
+                          check_connected_method=\
+                          self.test_mouse_right_click,
+                          pairing_twice=True)
+
+
     @test_wrapper('HID Reports Test', devices={"MOUSE":1})
     def cl_HID_reports_test(self):
         """Performs HID report test with mouse peripheral"""
@@ -116,6 +126,7 @@
         self.cl_adapter_pairing_test()
         self.cl_adapter_keyboard_pairing_test()
         self.cl_adapter_pairing_suspend_resume_test()
+        self.cl_adapter_pairing_twice_test()
         self.cl_HID_reports_test()
         self.cl_HID_keyboard_reports_test()
         self.cl_HID_reports_suspend_resume_test()

server/site_tests/bluetooth_AdapterCLSanity/control.cl_adapter_pairing_twice_test

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 badca5c..b210d48 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
@@ -9,7 +9,7 @@
 NAME = 'bluetooth_AdapterCLSanity.cl_adapter_pairing_twice_test'
 PURPOSE = 'Test bluetooth adapter pairing and connecting to a bluetooth device.'
 CRITERIA = 'Adapter should work in correct states.'
-ATTRIBUTES = ''
+ATTRIBUTES = 'suite:bluetooth, suite:bluetooth_e2e'
 TIME = 'SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'bluetooth'
@@ -38,12 +38,9 @@
 
 args_dict = utils.args_to_dict(args)
 chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
-newblue_enable = args_dict['newblue'] == 'enable'\
-  if 'newblue' in args_dict else False
 
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    bluetooth_test.enable_newblue(host=host, enable=newblue_enable)
     job.run_test('bluetooth_AdapterCLSanity', host=host,
                   num_iterations=1, test_name=NAME.split('.')[1])