commit 8d2cbf363de4aace06c65ddd20ec862431ce928c
author Scott James Remnant <keybuk@chromium.org> Tue Nov 12 11:00:25 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Nov 12 21:10:30 2013 +0000
tree 379e164b0f5400dbf62cce1cb043c50c2a54c1cc
parent 87f26bdadccad86f611a68d3ade34fc2c0098120

Bluetooth: rename BluetoothClient to BluetoothDevice

The BluetoothClient class, and BluetoothClientXmlRpcServer, were named
to match the WiFiClient class that they were based on. However for
Bluetooth tests, the DUT can actually behave as either a Client or a
Server depending on the requirements of the test - with the Tester
likewise behaving as a Server or Client appropriately.

This becomes confusing, so instead rename BluetoothClient to
BluetoothDevice so it's clear it refers to the DUT rather than its role.

BUG=chromium:256771
TEST=test_that suite:bluetooth_sanity

Change-Id: I75864de27325f3a74394a092ce7e538d8161f8a8
Reviewed-on: https://chromium-review.googlesource.com/176468
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>
Commit-Queue: Scott James Remnant <keybuk@chromium.org>
Tested-by: Scott James Remnant <keybuk@chromium.org>

server/cros/bluetooth/bluetooth_test.py

diff --git a/server/cros/bluetooth/bluetooth_test.py b/server/cros/bluetooth/bluetooth_test.py
index 5996cd9..2a54780 100644
--- a/server/cros/bluetooth/bluetooth_test.py
+++ b/server/cros/bluetooth/bluetooth_test.py
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import test
 from autotest_lib.server.cros import interactive_client
-from autotest_lib.server.cros.bluetooth import bluetooth_client
+from autotest_lib.server.cros.bluetooth import bluetooth_device
 from autotest_lib.server.cros.bluetooth import bluetooth_tester
 
 
@@ -15,7 +15,7 @@
     collection of Bluetooth tests that sets the following properties, depending
     on the arguments to the test and properties of the test object:
 
-      self.client - BluetoothClient object for the device being tested
+      self.device - BluetoothDevice object for the device being tested
       self.tester - BluetoothTester object for the device's partner tester
       self.interactive - InteractiveClient object for the device
 
@@ -30,11 +30,11 @@
 
     """
 
-    def warmup(self, client_host, tester_host, interactive=False):
+    def warmup(self, device_host, tester_host, interactive=False):
         """Initialize the test member objects based on its arguments."""
         super(BluetoothTest, self).warmup()
 
-        self.client = bluetooth_client.BluetoothClient(client_host)
+        self.device = bluetooth_device.BluetoothDevice(device_host)
 
         if tester_host:
             self.tester = bluetooth_tester.BluetoothTester(tester_host)
@@ -42,7 +42,7 @@
             self.tester = None
 
         if interactive:
-            self.interactive = interactive_client.InteractiveClient(client_host)
+            self.interactive = interactive_client.InteractiveClient(device_host)
         else:
             self.interactive = None
 
@@ -51,7 +51,7 @@
         """Close the test member objects."""
         if self.interactive:
             self.interactive.close()
-        self.client.close()
+        self.device.close()
         if self.tester:
             self.tester.close()