openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

addressing @dosaboy comments

This commit is contained in:
Jorge Niedbalski 2015-09-24 18:49:44 -03:00
parent ff5a276462
commit 6dba5d40dd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -35,7 +35,7 @@ publish: lint test
test: .venv
@echo Starting tests...
env CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) .venv/bin/nosetests\
env CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) .venv/bin/nosetests \
--nologcapture --with-coverage unit_tests/
functional_test:

8
unit_tests/test_rabbit_utils.py
View File

@ -13,7 +13,7 @@ class ConfigRendererTests(unittest.TestCase):
class FakeContext(object):
def __call__(self, *a, **k):
return {}
return {'foo': 'bar'}
config_map = collections.OrderedDict(
[('/this/is/a/config', {
@ -24,6 +24,7 @@ class ConfigRendererTests(unittest.TestCase):
)
def setUp(self):
super(ConfigRendererTests, self).setUp()
self.renderer = rabbit_utils.ConfigRenderer(
self.config_map)
@ -35,10 +36,9 @@ class ConfigRendererTests(unittest.TestCase):
@mock.patch("rabbit_utils.render")
def test_write_all(self, log, render):
self.renderer.write_all()
self.renderer.write('/this/is/a/config')
render.assert_called_once()
log.assert_called_once()
self.assertTrue(render.called)
self.assertTrue(log.called)
class UtilsTests(unittest.TestCase):

8
unit_tests/test_rabbitmq_context.py
View File

@ -17,8 +17,8 @@ class TestRabbitMQSSLContext(unittest.TestCase):
"ssl_mode": "off"
})
close_port.assert_called_once()
reconfig_ssl.assert_called_once()
self.assertTrue(close_port.called)
self.assertTrue(reconfig_ssl.called)
@mock.patch("rabbitmq_context.open_port")
@mock.patch("rabbitmq_context.os.chmod")
@ -61,8 +61,8 @@ class TestRabbitMQSSLContext(unittest.TestCase):
"ssl_mode": "on",
})
reconfig_ssl.assert_called_once()
open_port.assert_called_once()
self.assertTrue(reconfig_ssl.called)
self.assertTrue(open_port.called)
class TestRabbitMQClusterContext(unittest.TestCase):