autotest: server cros brand unification
Update 'Chrome OS' -> 'ChromeOS'
BUG=b:231760315
TEST=unittest; cq
Change-Id: I2ee151cd40da7a14b8d37c531530a93df666787a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3651418
Auto-Submit: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Derek Beckett <dbeckett@chromium.org>
Tested-by: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Commit-Queue: Jesse McGuire <jessemcguire@google.com>
diff --git a/server/cros/bluetooth/bluetooth_adapter_tests.py b/server/cros/bluetooth/bluetooth_adapter_tests.py
index fa67a4e..3bb0787 100644
--- a/server/cros/bluetooth/bluetooth_adapter_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_tests.py
@@ -729,7 +729,7 @@
ERROR_INVALID_ADVERTISING_INTERVALS = (
'org.bluez.Error.InvalidArguments: Invalid arguments')
- # Supported profiles by chrome os.
+ # Supported profiles by ChromeOS.
SUPPORTED_UUIDS = {
'GATT_UUID': '00001801-0000-1000-8000-00805f9b34fb',
'A2DP_SOURCE_UUID': '0000110a-0000-1000-8000-00805f9b34fb',
@@ -2069,7 +2069,7 @@
logging.debug('Saw Bluetooth ID of: %s', modalias)
# Valid Device ID is:
- # <00E0(Google)>/<C405(Chrome OS)>/<non-zero versionNumber>
+ # <00E0(Google)>/<C405(ChromeOS)>/<non-zero versionNumber>
bt_format = 'bluetooth:v00E0pC405d(?!0000)'
if not re.match(bt_format, modalias):
diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index b6b86b6..50d485a 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -1517,7 +1517,7 @@
boot_id = self.get_bootid()
self.faft_client.disconnect()
- # Press power button to trigger Chrome OS normal shutdown process.
+ # Press power button to trigger ChromeOS normal shutdown process.
# We use a customized delay since the normal-press 1.2s is not enough.
self.servo.power_key(self.faft_config.hold_pwr_button_poweroff)
# device can take 44-51 seconds to restart,
diff --git a/server/cros/provision.py b/server/cros/provision.py
index b9be87d..d84282e 100644
--- a/server/cros/provision.py
+++ b/server/cros/provision.py
@@ -66,9 +66,9 @@
to, and returns the corresponding version label prefix.
Known version label prefixes are:
- * `CROS_VERSION_PREFIX` for Chrome OS version strings.
+ * `CROS_VERSION_PREFIX` for ChromeOS version strings.
These images have names like `cave-release/R57-9030.0.0`.
- * `CROS_ANDROID_VERSION_PREFIX` for Chrome OS Android version strings.
+ * `CROS_ANDROID_VERSION_PREFIX` for ChromeOS Android version strings.
These images have names like `git_nyc-arc/cheets_x86-user/3512523`.
@param image: The image name to be parsed.
diff --git a/server/cros/provision_unittest.py b/server/cros/provision_unittest.py
index d593bf3..48afc37 100755
--- a/server/cros/provision_unittest.py
+++ b/server/cros/provision_unittest.py
@@ -46,12 +46,12 @@
self.assertEqual(prefix, expected)
def test_cros_prefix(self):
- """Test handling of Chrome OS version strings."""
+ """Test handling of ChromeOS version strings."""
self._do_test_prefixes(provision.CROS_VERSION_PREFIX,
_CROS_VERSION_SAMPLES)
def test_cros_android_prefix(self):
- """Test handling of Chrome OS version strings."""
+ """Test handling of ChromeOS version strings."""
self._do_test_prefixes(provision.CROS_ANDROID_VERSION_PREFIX,
_CROS_ANDROID_VERSION_SAMPLES)
diff --git a/server/cros/provisioner.py b/server/cros/provisioner.py
index b03b8e7..916a575 100644
--- a/server/cros/provisioner.py
+++ b/server/cros/provisioner.py
@@ -162,7 +162,7 @@
@param update_url: url to the image to update to.
"""
- # The Chrome OS version is generally the last element in the URL. The only
+ # The ChromeOS version is generally the last element in the URL. The only
# exception is delta update URLs, which are rooted under the version; e.g.,
# http://.../update/.../0.14.755.0/au/0.14.754.0. In this case we want to
# strip off the au section of the path before reading the version.
diff --git a/server/cros/servo/firmware_programmer.py b/server/cros/servo/firmware_programmer.py
index b08a98e..8f161a5 100644
--- a/server/cros/servo/firmware_programmer.py
+++ b/server/cros/servo/firmware_programmer.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-"""A utility to program Chrome OS devices' firmware using servo.
+"""A utility to program ChromeOS devices' firmware using servo.
This utility expects the DUT to be connected to a servo device. This allows us
to put the DUT into the required state and to actually program the DUT's
diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py
index 06981fe..245131f 100644
--- a/server/cros/telemetry_runner.py
+++ b/server/cros/telemetry_runner.py
@@ -335,7 +335,7 @@
"""Runs a telemetry test on a dut.
@param script: Which telemetry test script we want to run. Can be
- telemetry's base test script or the Chrome OS specific
+ telemetry's base test script or the ChromeOS specific
test script.
@param test: Telemetry test we want to run.
@param args: additional list of arguments to pass to the script.
