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

client/common_lib/base_barrier_unittest.py

 #!/usr/bin/python
 
 __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
 
 
 class listen_server_test(unittest.TestCase):
 
     def test_init(self):
         server = barrier.listen_server()
         server.close()
 
 
@@ skipping 20 matching lines @@
 
     def test_initialize(self):
         b = barrier.barrier('127.0.0.1#', 'testtag', 100, 11921)
         self.assertEqual(b._hostid, '127.0.0.1#')
         self.assertEqual(b._tag, 'testtag')
         self.assertEqual(b._timeout_secs, 100)
         self.assertEqual(b._port, 11921)
 
 
     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):
         b = barrier.barrier('127.0.0.1#', 'update', 100)
         b._update_timeout(120)
         self.assertEqual(b._timeout_secs, 120)
 
 
     def test_remaining(self):
         b = barrier.barrier('127.0.0.1#', 'remain', 100)
@@ skipping 125 matching lines @@
         Test that reusing the same listen server object works.
         """
         server = barrier.listen_server()
         self.rendezvous_test(10, listen_server=server)
         self.rendezvous_test(10, listen_server=server)
         self.rendezvous_test(10, listen_server=server)
 
 
 if __name__ == "__main__":
     unittest.main()