autotest: server tests brand unification

Update 'Chrome OS' -> 'ChromeOS'

BUG=b:231760315
TEST=unittest; cq

Change-Id: I8c0e4ad82d025c3eab3dfb47fa0bba4029a524a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3651415
Tested-by: Jesse McGuire <jessemcguire@google.com>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
Auto-Submit: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Derek Beckett <dbeckett@chromium.org>

24 files changed, 26 insertions, 26 deletions

diff --git a/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py b/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
index d0f5f2b6dc..4f32646fc2 100755
--- a/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
+++ b/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
@@ -14,7 +14,7 @@ from autotest_lib.server.cros.update_engine import update_engine_test
 
 
 class autoupdate_EndToEndTest(update_engine_test.UpdateEngineTest):
-    """Complete update test between two Chrome OS releases.
+    """Complete update test between two ChromeOS releases.
 
     Performs an end-to-end test of updating a ChromeOS device from one version
     to another. The test performs the following steps:
diff --git a/server/site_tests/autoupdate_FromUI/autoupdate_FromUI.py b/server/site_tests/autoupdate_FromUI/autoupdate_FromUI.py
index 8a5703e866..6684d8b5e0 100644
--- a/server/site_tests/autoupdate_FromUI/autoupdate_FromUI.py
+++ b/server/site_tests/autoupdate_FromUI/autoupdate_FromUI.py
@@ -11,7 +11,7 @@ class autoupdate_FromUI(update_engine_test.UpdateEngineTest):
     """Trigger an update from the UI.
 
     Start an update by clicking on the 'Check for update' button in the
-    Chrome OS settings menu, instead of calling to update_engine_client
+    ChromeOS settings menu, instead of calling to update_engine_client
     directly.
 
     """
diff --git a/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py b/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
index 48bfc2e459..4c001fd041 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
+++ b/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
@@ -18,7 +18,7 @@ class firmware_ConsecutiveBoot(FirmwareTest):
     /sbin/shutdown command to turn off DUT.
 
     This test is intended to be run with many iterations to ensure that the DUT
-    does boot into Chrome OS and then does power off later.
+    does boot into ChromeOS and then does power off later.
 
     The iteration should be specified by the parameter -a "faft_iterations=10".
     """
diff --git a/server/site_tests/firmware_ConsecutiveBootPowerButton/firmware_ConsecutiveBootPowerButton.py b/server/site_tests/firmware_ConsecutiveBootPowerButton/firmware_ConsecutiveBootPowerButton.py
index 3d16f79d4f..2d7bc038c0 100644
--- a/server/site_tests/firmware_ConsecutiveBootPowerButton/firmware_ConsecutiveBootPowerButton.py
+++ b/server/site_tests/firmware_ConsecutiveBootPowerButton/firmware_ConsecutiveBootPowerButton.py
@@ -13,7 +13,7 @@ class firmware_ConsecutiveBootPowerButton(FirmwareTest):
     Servo based consecutive boot test via power button for both on and off.
 
     This test is intended to be run with many iterations to ensure that the DUT
-    does boot into Chrome OS and then does power off later.
+    does boot into ChromeOS and then does power off later.
 
     The iteration should be specified by the parameter -a "faft_iterations=10".
     """
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
index 61160b916f..f99b57f317 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
@@ -14,7 +14,7 @@ class firmware_CorruptBothFwBodyAB(FirmwareTest):
 
     The firmware verification fails on loading RW firmware and enters recovery
     mode. It requires a USB disk plugged-in, which contains a
-    Chrome OS test image (built by "build_image --test").
+    ChromeOS test image (built by "build_image --test").
     """
     version = 1
     NEEDS_SERVO_USB = True
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py b/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
index 6f177425ee..1f66fcee15 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
@@ -12,7 +12,7 @@ class firmware_CorruptBothFwSigAB(FirmwareTest):
     """
     Servo based both firmware signature A and B corruption test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test corrupts
     both firmware signature A and B. On next reboot, the firmware verification
     fails and enters recovery mode. This test then checks the success of the
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py b/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
index 855597c250..92f9e2406a 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
+++ b/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
@@ -12,7 +12,7 @@ class firmware_CorruptBothKernelAB(FirmwareTest):
     """
     Servo based both kernel A and B corruption test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test corrupts
     both kernel A and B. On next reboot, the kernel verification fails
     and enters recovery mode. This test then checks the success of the
diff --git a/server/site_tests/firmware_DevBootUSB/firmware_DevBootUSB.py b/server/site_tests/firmware_DevBootUSB/firmware_DevBootUSB.py
index 775fc60c9d..498eaef401 100644
--- a/server/site_tests/firmware_DevBootUSB/firmware_DevBootUSB.py
+++ b/server/site_tests/firmware_DevBootUSB/firmware_DevBootUSB.py
@@ -12,7 +12,7 @@ class firmware_DevBootUSB(FirmwareTest):
     """
     Servo based Ctrl-U developer USB boot test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image test"). On runtime, this test first switches
     DUT to developer mode. When dev_boot_usb=0, pressing Ctrl-U on developer
     screen should not boot the USB disk. When dev_boot_usb=1, pressing Ctrl-U
diff --git a/server/site_tests/firmware_DevDefaultBoot/firmware_DevDefaultBoot.py b/server/site_tests/firmware_DevDefaultBoot/firmware_DevDefaultBoot.py
index fb55b6c3f5..4765cedff5 100644
--- a/server/site_tests/firmware_DevDefaultBoot/firmware_DevDefaultBoot.py
+++ b/server/site_tests/firmware_DevDefaultBoot/firmware_DevDefaultBoot.py
@@ -10,7 +10,7 @@ from autotest_lib.server.cros.faft.firmware_test import FirmwareTest
 
 class firmware_DevDefaultBoot(FirmwareTest):
     """
-    This test requires a USB disk plugged in, containing a Chrome OS test image.
+    This test requires a USB disk plugged in, containing a ChromeOS test image.
     On runtime, this test first switches DUT to developer mode, and modifies
     the dev_default_boot crossystem value.
     After waiting at the dev warning, or pressing enter in the detachable UI
diff --git a/server/site_tests/firmware_FingerprintCrosConfig/firmware_FingerprintCrosConfig.py b/server/site_tests/firmware_FingerprintCrosConfig/firmware_FingerprintCrosConfig.py
index e32bd750e9..de4bc26786 100644
--- a/server/site_tests/firmware_FingerprintCrosConfig/firmware_FingerprintCrosConfig.py
+++ b/server/site_tests/firmware_FingerprintCrosConfig/firmware_FingerprintCrosConfig.py
@@ -9,7 +9,7 @@ from autotest_lib.server import test
 
 
 class firmware_FingerprintCrosConfig(test.test):
-    """Test Chrome OS config behavior for http://b/160271883."""
+    """Test ChromeOS config behavior for http://b/160271883."""
     version = 1
 
     def initialize(self, host):
diff --git a/server/site_tests/firmware_FwScreenCloseLid/firmware_FwScreenCloseLid.py b/server/site_tests/firmware_FwScreenCloseLid/firmware_FwScreenCloseLid.py
index 1f3724bc00..e05608dc41 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/firmware_FwScreenCloseLid.py
+++ b/server/site_tests/firmware_FwScreenCloseLid/firmware_FwScreenCloseLid.py
@@ -13,7 +13,7 @@ class firmware_FwScreenCloseLid(FirmwareTest):
     """
     Servo based lid close triggered shutdown test during firmware screens.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test triggers
     firmware screens (developer, remove, insert, yuck, to_norm screens),
     and then closes the lid in order to power the machine down.
diff --git a/server/site_tests/firmware_FwScreenPressPower/firmware_FwScreenPressPower.py b/server/site_tests/firmware_FwScreenPressPower/firmware_FwScreenPressPower.py
index 2b08c0142e..362b7da2c2 100644
--- a/server/site_tests/firmware_FwScreenPressPower/firmware_FwScreenPressPower.py
+++ b/server/site_tests/firmware_FwScreenPressPower/firmware_FwScreenPressPower.py
@@ -13,7 +13,7 @@ class firmware_FwScreenPressPower(FirmwareTest):
     """
     Servo based power button triggered shutdown test during firmware screens.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test triggers
     firmware screens (developer, remove, insert, yuck, and to_norm screens),
     and then presses the power button in order to power the machine down.
diff --git a/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py b/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
index 55d965063b..46a2543c5f 100644
--- a/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
+++ b/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
@@ -14,7 +14,7 @@ class firmware_InvalidUSB(FirmwareTest):
     """
     Servo based booting an invalid USB image test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test corrupts the
     USB image and tries to boot into it. A failure is expected. It then
     restores the USB image and boots into it again.
diff --git a/server/site_tests/firmware_LegacyRecovery/firmware_LegacyRecovery.py b/server/site_tests/firmware_LegacyRecovery/firmware_LegacyRecovery.py
index e91eb082d8..1835fd5180 100644
--- a/server/site_tests/firmware_LegacyRecovery/firmware_LegacyRecovery.py
+++ b/server/site_tests/firmware_LegacyRecovery/firmware_LegacyRecovery.py
@@ -14,7 +14,7 @@ class firmware_LegacyRecovery(FirmwareTest):
     """
     Servo based test to Verify recovery request at Remove Screen.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). It recovery boots to the USB image
     and sets recovery_request=1 and do a reboot. A failure is expected.
     """
diff --git a/server/site_tests/firmware_PDPowerSwap/firmware_PDPowerSwap.py b/server/site_tests/firmware_PDPowerSwap/firmware_PDPowerSwap.py
index 26ea1b6d92..d024e9012a 100644
--- a/server/site_tests/firmware_PDPowerSwap/firmware_PDPowerSwap.py
+++ b/server/site_tests/firmware_PDPowerSwap/firmware_PDPowerSwap.py
@@ -118,7 +118,7 @@ class firmware_PDPowerSwap(FirmwareTest):
         Set the DUT power role to source and then suspend the DUT.
         Verify SRC-to-SNK power role request from the PD tester works,
         while SNK-to-SRC power role request fails. Note that this is
-        Chrome OS policy decision, not part of the PD spec.
+        ChromeOS policy decision, not part of the PD spec.
 
         When DUT doesn't provide power in suspend, set DUT power role
         to sink, supend DUT and check if SNK-to-SRC power role request fails.
diff --git a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
index 711909012d..7476762462 100644
--- a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
+++ b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
@@ -13,7 +13,7 @@ class firmware_RecoveryButton(FirmwareTest):
     """
     Servo based recovery button test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test emulates
     recovery button pressed and reboots. It then triggers recovery mode in
     two cases: (1) plug in the USB disk before power-on (2) plug in the USB
diff --git a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
index dbbf372ad6..703b3df33f 100644
--- a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
+++ b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
@@ -12,7 +12,7 @@ class firmware_RollbackFirmware(FirmwareTest):
     """
     Servo based firmware rollback test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test rollbacks
     firmware A and results firmware B boot. It then rollbacks firmware B and
     results recovery boot.
diff --git a/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py b/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
index 085f0163d6..e016349df5 100644
--- a/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
+++ b/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
@@ -12,7 +12,7 @@ class firmware_RollbackKernel(FirmwareTest):
     """
     Servo based kernel rollback test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). In normal mode, this test rollbacks
     kernel A and results kernel B boot. It then rollbacks kernel B and
     results recovery boot. In developer mode, the firmware ignores kernel
diff --git a/server/site_tests/firmware_SelfSignedBoot/firmware_SelfSignedBoot.py b/server/site_tests/firmware_SelfSignedBoot/firmware_SelfSignedBoot.py
index 59bc4f6d02..a2b11bf745 100644
--- a/server/site_tests/firmware_SelfSignedBoot/firmware_SelfSignedBoot.py
+++ b/server/site_tests/firmware_SelfSignedBoot/firmware_SelfSignedBoot.py
@@ -13,7 +13,7 @@ class firmware_SelfSignedBoot(FirmwareTest):
     """
     Servo based developer mode boot only test to Self signed Kernels.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by 'build_image test'). On runtime, this test first switches
     DUT to dev mode. When dev_boot_usb=1 and dev_boot_signed_only=1, pressing
     Ctrl-U on developer screen should not boot the USB disk(recovery mode boot
diff --git a/server/site_tests/firmware_TPMNotCorruptedDevMode/firmware_TPMNotCorruptedDevMode.py b/server/site_tests/firmware_TPMNotCorruptedDevMode/firmware_TPMNotCorruptedDevMode.py
index a82bdb300f..8f1fa31e20 100644
--- a/server/site_tests/firmware_TPMNotCorruptedDevMode/firmware_TPMNotCorruptedDevMode.py
+++ b/server/site_tests/firmware_TPMNotCorruptedDevMode/firmware_TPMNotCorruptedDevMode.py
@@ -16,7 +16,7 @@ class firmware_TPMNotCorruptedDevMode(FirmwareTest):
     to USB and checks the firmware version and kernel version via crossystem for
     corruption.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image test").
     """
     version = 1
diff --git a/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py b/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
index da49d6b582..cae086c8bc 100644
--- a/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
+++ b/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
@@ -12,7 +12,7 @@ class firmware_UserRequestRecovery(FirmwareTest):
     """
     Servo based user request recovery boot test.
 
-    This test requires a USB disk plugged-in, which contains a Chrome OS test
+    This test requires a USB disk plugged-in, which contains a ChromeOS test
     image (built by "build_image --test"). On runtime, this test first requests
     a recovery mode on next boot by setting the crossystem recovery_request
     flag. It then triggers recovery mode by unplugging and plugging in the USB
diff --git a/server/site_tests/infra_FirmwareAutoupdate/infra_FirmwareAutoupdate.py b/server/site_tests/infra_FirmwareAutoupdate/infra_FirmwareAutoupdate.py
index 85c5967893..2d5283b1a9 100644
--- a/server/site_tests/infra_FirmwareAutoupdate/infra_FirmwareAutoupdate.py
+++ b/server/site_tests/infra_FirmwareAutoupdate/infra_FirmwareAutoupdate.py
@@ -16,7 +16,7 @@ class infra_FirmwareAutoupdate(test.test):
 
     In the test lab, this step is suppressed, to prevent devices from
     inadvertently updating to a new firmware version as a consequence of
-    installing a new Chrome OS build for testing.  In particular,
+    installing a new ChromeOS build for testing.  In particular,
     because the firmware is updated whenever the bundled firmware is
     _different_, and not merely _more recent_, suppressing the update
     prevents unexpectedly downgrading the firmware.
diff --git a/server/site_tests/provision_CheetsUpdate/README.md b/server/site_tests/provision_CheetsUpdate/README.md
index 080672be0c..17a301dee7 100644
--- a/server/site_tests/provision_CheetsUpdate/README.md
+++ b/server/site_tests/provision_CheetsUpdate/README.md
@@ -28,9 +28,9 @@ Warning: If the command fails, check run\_push\_to\_device method in
 
 ## Updating the autotest
 
-After you submit your changes, [Chrome OS lab deputy will push it to
+After you submit your changes, [ChromeOS lab deputy will push it to
 prod](https://sites.google.com/a/google.com/chromeos/for-team-members/infrastructure/chromeos-admin/push-to-prod).
-Send a heads up to [Chrome OS lab
+Send a heads up to [ChromeOS lab
 deputy](https://sites.google.com/a/google.com/chromeos/for-team-members/infrastructure/chrome-os-infrastructure-deputy)
 that this change is there.
 
diff --git a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
index 7cb9d0ec7d..9e72c4af91 100644
--- a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
+++ b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
@@ -46,7 +46,7 @@ EXTRA_ARGS_MAP = {
 
 DEFAULT_YEAR = str(datetime.now().year)
 
-DEFAULT_AUTHOR = 'Chrome OS Team'
+DEFAULT_AUTHOR = 'ChromeOS Team'
 
 CONTROLFILE_TEMPLATE = (
         """# Copyright {year} The Chromium OS Authors. All rights reserved.
@@ -69,7 +69,7 @@ PY_VERSION = 3
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 {test}
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''