|
|
@@ -17,6 +17,7 @@ |
|
|
|
|
|
import unittest
|
|
|
import amulet
|
|
|
+import re
|
|
|
|
|
|
|
|
|
class TestBindClientPort(unittest.TestCase):
|
|
|
@@ -42,30 +43,32 @@ class TestBindClientPort(unittest.TestCase): |
|
|
Test to verify that we update client port bindings successfully.
|
|
|
|
|
|
"""
|
|
|
- import pdb; pdb.set_trace()
|
|
|
self.d.configure('zookeeper', {'network_interface': 'eth0'})
|
|
|
- self.d.sentry.wait_for_messages({'zookeeper': 'ready'}, timeout=1800)
|
|
|
- ret = self.zookeeper.run(
|
|
|
+ self.d.sentry.wait_for_messages({'zookeeper': 'updating network interface'}, timeout=60)
|
|
|
+ self.d.sentry.wait_for_messages({'zookeeper': 'ready (3 zk nodes)'}, timeout=60)
|
|
|
+ ret = self.unit.run(
|
|
|
'grep clientPortAddress /etc/zookeeper/conf/zoo.cfg')[0]
|
|
|
matcher = re.compile(
|
|
|
"^clientPortAddress=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}.*")
|
|
|
|
|
|
- self.assertTrue('host.name' in ret)
|
|
|
self.assertTrue(matcher.match(ret))
|
|
|
|
|
|
# Verify that smoke tests still run
|
|
|
smk_uuid = self.unit.action_do("smoke-test")
|
|
|
output = self.d.action_fetch(smk_uuid, full_output=True)
|
|
|
assert "completed" in output['status']
|
|
|
|
|
|
+ @unittest.skip(
|
|
|
+ 'Broken handling of 0.0.0.0 bindings upstream, in Zookeeper project.')
|
|
|
def test_reset_bindings(self):
|
|
|
"""
|
|
|
Verify that we can reset the client port bindings to 0.0.0.0
|
|
|
|
|
|
"""
|
|
|
self.d.configure('zookeeper', {'network_interface': '0.0.0.0'})
|
|
|
- self.d.sentry.wait_for_messages({'zookeeper': 'ready'}, timeout=1800)
|
|
|
- ret = self.zookeeper.run(
|
|
|
+ self.d.sentry.wait_for_messages({'zookeeper': 'updating network interface'}, timeout=60)
|
|
|
+ self.d.sentry.wait_for_messages({'zookeeper': 'ready (3 zk nodes)'}, timeout=60)
|
|
|
+ ret = self.unit.run(
|
|
|
'grep clientPortAddress /etc/zookeeper/conf/zoo.cfg')[0]
|
|
|
|
|
|
matcher = re.compile("^clientPortAddress=0\.0\.0\.0.*")
|
|
|
@@ -75,3 +78,7 @@ class TestBindClientPort(unittest.TestCase): |
|
|
smk_uuid = self.unit.action_do("smoke-test")
|
|
|
output = self.d.action_fetch(smk_uuid, full_output=True)
|
|
|
assert "completed" in output['status']
|
|
|
+
|
|
|
+
|
|
|
+if __name__ == '__main__':
|
|
|
+ unittest.main()
|