commit 5f0442d3daab45adf7d0dafd14075f8b3ac1ef41
author Mary Ruthven <mruthven@chromium.org> Fri Jul 07 11:32:38 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Jul 10 15:27:18 2017 -0700
tree 12ecf77e273208b80697cc55d48aa095e3da222f
parent 993cb39a1fbbf342d4e29bc9da360152c42857e2

cr50_utils: change UsbUpdate to UsbUpdater

the cr50 utility is usb_updater. This changes the cr50_utils utility
from UsbUpdate to UsbUpdater to match the name of the cr50 updater.

BUG=none
BRANCH=none
TEST=none

Change-Id: Ia39b4087162aa0890c5ce8991adc1d89be5bb562
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/563510
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

client/common_lib/cros/cr50_utils.py

diff --git a/client/common_lib/cros/cr50_utils.py b/client/common_lib/cros/cr50_utils.py
index ded497c..043708f 100644
--- a/client/common_lib/cros/cr50_utils.py
+++ b/client/common_lib/cros/cr50_utils.py
@@ -137,7 +137,7 @@
     return FindVersion(result, "--fwver")
 
 
-def UsbUpdate(client, args):
+def UsbUpdater(client, args):
     """Run usb_update with the given args.
 
     Args:
@@ -175,7 +175,7 @@
 
 def GetVersionFromUpdater(client, args):
     """Return the version from usb_updater"""
-    result = UsbUpdate(client, args).stdout.strip()
+    result = UsbUpdater(client, args).stdout.strip()
     return FindVersion(result, args[0])
 
 
@@ -360,7 +360,7 @@
     Raises:
         TestFail if the second board id response field is not ~board_id
     """
-    result = UsbUpdate(client, ["-i"]).stdout.strip()
+    result = UsbUpdater(client, ["-i"]).stdout.strip()
     board_id_info = result.split("Board ID space: ")[-1].strip().split(":")
     board_id, board_id_inv, flags = [int(val, 16) for val in board_id_info]
     logging.info('BOARD_ID: %x:%x:%x', board_id, board_id_inv, flags)
@@ -419,6 +419,6 @@
         board_id_arg += ':' + hex(flags)
 
     # Set the board id using the given board id and flags
-    result = UsbUpdate(client, ["-s", "-i", board_id_arg]).stdout.strip()
+    result = UsbUpdater(client, ["-s", "-i", board_id_arg]).stdout.strip()
 
     CheckBoardId(client, board_id, flags)

server/site_tests/firmware_Cr50Update/firmware_Cr50Update.py

diff --git a/server/site_tests/firmware_Cr50Update/firmware_Cr50Update.py b/server/site_tests/firmware_Cr50Update/firmware_Cr50Update.py
index 47a9ef5..6913706 100644
--- a/server/site_tests/firmware_Cr50Update/firmware_Cr50Update.py
+++ b/server/site_tests/firmware_Cr50Update/firmware_Cr50Update.py
@@ -165,7 +165,7 @@
         # Enable CCD, so we can detect the Cr50 reboot.
         self.cr50.ccd_enable()
 
-        cr50_utils.UsbUpdate(self.host, ['-s', dest])
+        cr50_utils.UsbUpdater(self.host, ['-s', dest])
 
         # After usb_updater finishes running, Cr50 will reboot. Wait until Cr50
         # reboots before continuing. Cr50 reboot can be detected by detecting