commit a96ac8f5413a85ad0ff9ffdcff1ee1af6cde5e8a
author Tien Chang <tienchang@google.com> Fri Dec 04 10:28:49 2015 -0800
committer chrome-bot <chrome-bot@chromium.org> Fri Jan 08 14:53:10 2016 -0800
tree 3f9e7816fc06f650a1dbfd36b11c6301905f250d
parent 13045d565f6a9fba0e5308f9603373ba79862f60

host_lock_manager: Pass in global AFE instance for autotest shards

BUG=chromium:540060
TEST=ran with trybot image; can successfully lock 'packet_capture'

Change-Id: Ie6197635648b32ff1b9ac2456404d342f0104c24
Reviewed-on: https://chromium-review.googlesource.com/315943
Commit-Ready: Tien Chang <tienchang@chromium.org>
Tested-by: Tien Chang <tienchang@chromium.org>
Reviewed-by: Fang Deng <fdeng@chromium.org>

server/cros/dynamic_suite/job_status_unittest.py

diff --git a/server/cros/dynamic_suite/job_status_unittest.py b/server/cros/dynamic_suite/job_status_unittest.py
index 13b7a4d..9bf4d17 100755
--- a/server/cros/dynamic_suite/job_status_unittest.py
+++ b/server/cros/dynamic_suite/job_status_unittest.py
@@ -14,7 +14,6 @@
 import time
 import unittest
 import os
-
 import common
 
 from autotest_lib.server import frontend

server/cros/host_lock_manager.py

diff --git a/server/cros/host_lock_manager.py b/server/cros/host_lock_manager.py
index 0cdded1..2c88c20 100644
--- a/server/cros/host_lock_manager.py
+++ b/server/cros/host_lock_manager.py
@@ -4,8 +4,9 @@
 
 import logging
 import signal
-
 import common
+
+from autotest_lib.server import site_utils
 from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
 
 """HostLockManager class, for the dynamic_suite module.
@@ -57,9 +58,9 @@
 
         @param afe: an instance of AFE as defined in server/frontend.py.
         """
-        self._afe = afe or frontend_wrappers.RetryingAFE(timeout_min=30,
-                                                         delay_sec=10,
-                                                         debug=False)
+        self._afe = afe or frontend_wrappers.RetryingAFE(
+                            timeout_min=30, delay_sec=10, debug=False,
+                            server=site_utils.get_global_afe_hostname())
         # Keep track of hosts locked by this instance.
         self._locked_hosts = set()
 

server/cros/host_lock_manager_unittest.py

diff --git a/server/cros/host_lock_manager_unittest.py b/server/cros/host_lock_manager_unittest.py
index fac8abd..27c3539 100755
--- a/server/cros/host_lock_manager_unittest.py
+++ b/server/cros/host_lock_manager_unittest.py
@@ -8,12 +8,11 @@
 
 import mox
 import unittest
-
 import common
+
 from autotest_lib.server import frontend
 from autotest_lib.server.cros import host_lock_manager
 
-
 class HostLockManagerTest(mox.MoxTestBase):
     """Unit tests for host_lock_manager.HostLockManager.