commit d72eeeb06a3db538c2321addbd3c3f86ddce156d
author Richard Barnette <jrbarnette@chromium.org> Wed Sep 05 10:08:33 2018 -0700
committer Richard Barnette <jrbarnette@chromium.org> Fri Sep 07 15:13:25 2018 +0000
tree 059431b2caf034c6bc0d0488532a72801aec492b
parent 553c58d920b7d3e0489c63f322398c562f7685c0

[autotest] Rename server/hosts/repair to repair_utils.

To avoid naming confusion between the `repair` method and the module
named `repair`, rename the latter to `repair_utils`.

BUG=None
TEST=None

Change-Id: I63ddb544b24ebb7002a4719359dd536145ef7452
Reviewed-on: https://chromium-review.googlesource.com/1207552
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Congbin Guo <guocb@chromium.org>

server/hosts/servo_repair.py

diff --git a/server/hosts/servo_repair.py b/server/hosts/servo_repair.py
index 0fb2f97..8fd5ba2 100644
--- a/server/hosts/servo_repair.py
+++ b/server/hosts/servo_repair.py
@@ -8,7 +8,7 @@
 import common
 from autotest_lib.client.common_lib import hosts
 from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
-from autotest_lib.server.hosts import repair
+from autotest_lib.server.hosts import repair_utils
 
 
 class _UpdateVerifier(hosts.Verifier):
@@ -295,7 +295,7 @@
         return 'Start servod with the proper config settings.'
 
 
-class _ServoRebootRepair(repair.RebootRepair):
+class _ServoRebootRepair(repair_utils.RebootRepair):
     """
     Reboot repair action that also waits for an update.
 
@@ -352,7 +352,7 @@
     """
     config = ['brd_config', 'ser_config']
     verify_dag = [
-        (repair.SshVerifier,         'servo_ssh',   []),
+        (repair_utils.SshVerifier,   'servo_ssh',   []),
         (_UpdateVerifier,            'update',      ['servo_ssh']),
         (_BoardConfigVerifier,       'brd_config',  ['servo_ssh']),
         (_SerialConfigVerifier,      'ser_config',  ['servo_ssh']),
@@ -372,7 +372,7 @@
 
     servod_deps = ['job', 'servod', 'pwr_button']
     repair_actions = [
-        (repair.RPMCycleRepair, 'rpm', [], ['servo_ssh']),
+        (repair_utils.RPMCycleRepair, 'rpm', [], ['servo_ssh']),
         (_RestartServod, 'restart', ['servo_ssh'], config + servod_deps),
         (_ServoRebootRepair, 'servo_reboot', ['servo_ssh'], servod_deps),
         (_DutRebootRepair, 'dut_reboot', ['servod'], ['lid_open']),