Merge remote branch 'cros/upstream' into master

client/common_lib/barrier_unittest.py

Index: client/common_lib/barrier_unittest.py
diff --git a/client/common_lib/barrier_unittest.py b/client/common_lib/barrier_unittest.py
index 37de2bfe124f37c13c1214688d3c0aef7fd523b3..58abeb37f2f9b300331ed1202c6bfbbbfb31f143 100755
--- a/client/common_lib/barrier_unittest.py
+++ b/client/common_lib/barrier_unittest.py
@@ -47,15 +47,13 @@ class barrier_test(unittest.TestCase):
 
 
     def test_get_host_from_id(self):
-        b = barrier.barrier('127.0.0.1#', 'testgethost', 100)
-
-        hostname = b._get_host_from_id('my_host')
+        hostname = barrier.get_host_from_id('my_host')
         self.assertEqual(hostname, 'my_host')
 
-        hostname = b._get_host_from_id('my_host#')
+        hostname = barrier.get_host_from_id('my_host#')
         self.assertEqual(hostname, 'my_host')
 
-        self.assertRaises(error.BarrierError, b._get_host_from_id, '#my_host')
+        self.assertRaises(error.BarrierError, barrier.get_host_from_id, '#my_host')
 
 
     def test_update_timeout(self):