Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/common_lib/base_barrier_unittest.py

Index: client/common_lib/base_barrier_unittest.py
diff --git a/client/common_lib/base_barrier_unittest.py b/client/common_lib/base_barrier_unittest.py
index 71ea53842f958c489c9cff59852b2b186a73f6cc..52d8e1734dae08eb36684aa9ba6bc48ad101ac75 100755
--- a/client/common_lib/base_barrier_unittest.py
+++ b/client/common_lib/base_barrier_unittest.py
@@ -5,7 +5,7 @@ __author__ = """Ashwin Ganti (aganti@google.com)"""
 import os, sys, socket, errno, unittest, threading
 from time import time, sleep
 import common
-from autotest_lib.client.common_lib import error, barrier, base_barrier
+from autotest_lib.client.common_lib import error, barrier
 from autotest_lib.client.common_lib.test_utils import mock
 
 
@@ -46,14 +46,15 @@ class barrier_test(unittest.TestCase):
 
 
     def test_get_host_from_id(self):
-        hostname = base_barrier.get_host_from_id('my_host')
+        b = barrier.barrier('127.0.0.1#', 'testgethost', 100)
+
+        hostname = b._get_host_from_id('my_host')
         self.assertEqual(hostname, 'my_host')
 
-        hostname = base_barrier.get_host_from_id('my_host#')
+        hostname = b._get_host_from_id('my_host#')
         self.assertEqual(hostname, 'my_host')
 
-        self.assertRaises(error.BarrierError,
-                          base_barrier.get_host_from_id, '#my_host')
+        self.assertRaises(error.BarrierError, b._get_host_from_id, '#my_host')
 
 
     def test_update_timeout(self):