Merge lp:~gnuoy/charms/trusty/glance/untest-tox-fix into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Liam Young]

[Edward Hope-Morley (hopem)]

lgtm +1 if oscsi agrees.

[lp:~gnuoy/charms/trusty/glance/untest-tox-fix]

143. By Liam Young on 2015-09-28

Fix test_glance_ipv6_context_service_enabled which was passing by accident rather than by design

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10899 glance-next for gnuoy mp272578
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10899/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10116 glance-next for gnuoy mp272578
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10116/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6854 glance-next for gnuoy mp272578
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12605835/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6854/

=== modified file 'unit_tests/test_glance_contexts.py'
--- unit_tests/test_glance_contexts.py	2015-08-27 11:44:11 +0000
+++ unit_tests/test_glance_contexts.py	2015-09-28 11:53:43 +0000
@@ -81,17 +81,23 @@
                                    'ext_ports': [9282],
                                    'namespace': 'glance'})
 
+    @patch('charmhelpers.contrib.openstack.context.config')
     @patch("subprocess.check_output")
-    def test_glance_ipv6_context_service_enabled(self, mock_subprocess):
+    def test_glance_ipv6_context_service_enabled(self, mock_subprocess,
+                                                 mock_config):
         self.config.return_value = True
+        mock_config.return_value = True
         mock_subprocess.return_value = 'true'
         ctxt = contexts.GlanceIPv6Context()
         self.assertEquals(ctxt(), {'bind_host': '::',
                                    'registry_host': '[::]'})
 
+    @patch('charmhelpers.contrib.openstack.context.config')
     @patch("subprocess.check_output")
-    def test_glance_ipv6_context_service_disabled(self, mock_subprocess):
+    def test_glance_ipv6_context_service_disabled(self, mock_subprocess,
+                                                  mock_config):
         self.config.return_value = False
+        mock_config.return_value = False
         mock_subprocess.return_value = 'false'
         ctxt = contexts.GlanceIPv6Context()
         self.assertEquals(ctxt(), {'bind_host': '0.0.0.0',

=== modified file 'unit_tests/test_glance_utils.py'
--- unit_tests/test_glance_utils.py	2015-08-25 14:41:24 +0000
+++ unit_tests/test_glance_utils.py	2015-09-28 11:53:43 +0000
@@ -5,9 +5,7 @@
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
 
-with patch('charmhelpers.core.hookenv.config') as config:
-    import hooks.glance_utils as utils
-
+import hooks.glance_utils as utils
 from test_utils import (
     CharmTestCase,
 )