Merge branch 'stable-2.6'

[ganeti-local] / test / ganeti.confd.client_unittest.py

diff --git a/test/ganeti.confd.client_unittest.py b/test/ganeti.confd.client_unittest.py
index 7c5c2ef..0afec60 100755 (executable)
--- a/test/ganeti.confd.client_unittest.py
+++ b/test/ganeti.confd.client_unittest.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the confd client module"""
@@ -182,7 +182,7 @@ class _BaseClientTest:
   def testSetPeersFamily(self):
     self.client._SetPeersAddressFamily()
     self.assertEquals(self.client._family, self.family)
-    mixed_peers = ["1.2.3.6", "2001:db8:beef::13"]
+    mixed_peers = ["192.0.2.99", "2001:db8:beef::13"]
     self.client.UpdatePeerList(mixed_peers)
     self.assertRaises(errors.ConfdClientError,
                       self.client._SetPeersAddressFamily)
@@ -190,17 +190,17 @@ class _BaseClientTest:
 
 class TestIP4Client(unittest.TestCase, _BaseClientTest):
   """Client tests"""
-  mc_list = ["10.0.0.1",
-             "10.0.0.2",
-             "10.0.0.3",
-             "10.0.0.4",
-             "10.0.0.5",
-             "10.0.0.6",
-             "10.0.0.7",
-             "10.0.0.8",
-             "10.0.0.9",
+  mc_list = ["192.0.2.1",
+             "192.0.2.2",
+             "192.0.2.3",
+             "192.0.2.4",
+             "192.0.2.5",
+             "192.0.2.6",
+             "192.0.2.7",
+             "192.0.2.8",
+             "192.0.2.9",
             ]
-  new_peers = ["1.2.3.4", "1.2.3.5"]
+  new_peers = ["198.51.100.1", "198.51.100.2"]
   family = socket.AF_INET
 
   def setUp(self):