Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1468)

Unified Diff: tests/test_utils.py

Issue 8727047: Refactor Charm for Sandbox support
Patch Set: Refactor Charm for Sandbox support Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/test_backends.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/test_utils.py
=== modified file 'tests/test_utils.py'
--- tests/test_utils.py 2013-03-28 09:39:45 +0000
+++ tests/test_utils.py 2013-04-15 17:04:58 +0000
@@ -30,7 +30,6 @@
start_agent,
start_gui,
start_improv,
- stop,
WEB_PORT,
)
# Import the whole utils package for monkey patching.
@@ -544,7 +543,7 @@
config_js_path=config_js_file.name)
self.assertEqual(self.svc_ctl_call_count, 2)
self.assertEqual(self.service_names, ['nginx', 'haproxy'])
- self.assertEqual(self.actions, [charmhelpers.START] * 2)
+ self.assertEqual(self.actions, [charmhelpers.RESTART] * 2)
haproxy_conf = haproxy_file.read()
self.assertIn('ca-base {0}'.format(ssl_cert_path), haproxy_conf)
self.assertIn('crt-base {0}'.format(ssl_cert_path), haproxy_conf)
@@ -584,20 +583,6 @@
# The insecure approach eliminates the https redirect.
self.assertNotIn('redirect scheme https', haproxy_conf)
- def test_stop_staging(self):
- stop(True)
- self.assertEqual(self.svc_ctl_call_count, 3)
- self.assertEqual(
- self.service_names, ['haproxy', 'nginx', 'juju-api-improv'])
- self.assertEqual(self.actions, [charmhelpers.STOP] * 3)
-
- def test_stop_production(self):
- stop(False)
- self.assertEqual(self.svc_ctl_call_count, 3)
- self.assertEqual(
- self.service_names, ['haproxy', 'nginx', 'juju-api-agent'])
- self.assertEqual(self.actions, [charmhelpers.STOP] * 3)
-
if __name__ == '__main__':
unittest.main(verbosity=2)
« no previous file with comments | « tests/test_backends.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b