summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-07-13 12:59:16 -0400
committerScott Moser <smoser@brickies.net>2017-07-13 14:51:48 -0400
commit7b13279109d9eb3d1b102bb5ae8900c3d8423537 (patch)
treeee34377dc4685a9da2713ec71f11b1d6e26b0ac5 /tests
parent812c36823e085416afab7a35233cb8ff704d2e22 (diff)
downloadvyos-cloud-init-7b13279109d9eb3d1b102bb5ae8900c3d8423537.tar.gz
vyos-cloud-init-7b13279109d9eb3d1b102bb5ae8900c3d8423537.zip
tests: fix usage of mock in GCE test.
The usage of mock in this test was simply invalid and only worked by happenstance.
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_datasource/test_gce.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index 3e8398b3..ad608bec 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -72,11 +72,11 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
self.ds = DataSourceGCE.DataSourceGCE(
settings.CFG_BUILTIN, None,
helpers.Paths({}))
- self.m_platform_reports_gce = mock.patch(
- 'cloudinit.sources.DataSourceGCE.platform_reports_gce',
- return_value=True)
- self.m_platform_reports_gce.start()
- self.addCleanup(self.m_platform_reports_gce.stop)
+ ppatch = self.m_platform_reports_gce = mock.patch(
+ 'cloudinit.sources.DataSourceGCE.platform_reports_gce')
+ self.m_platform_reports_gce = ppatch.start()
+ self.m_platform_reports_gce.return_value = True
+ self.addCleanup(ppatch.stop)
super(TestDataSourceGCE, self).setUp()
def test_connection(self):
@@ -163,10 +163,12 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
self.assertEqual(True, r)
self.assertEqual('bar', self.ds.availability_zone)
- @mock.patch('cloudinit.sources.DataSourceGCE.platform_reports_gce')
- def test_get_data_returns_false_if_not_on_gce(self, m_platform_gce):
- m_platform_gce.return_value = False
- self.assertEqual(False, self.ds.get_data())
+ @mock.patch("cloudinit.sources.DataSourceGCE.GoogleMetadataFetcher")
+ def test_get_data_returns_false_if_not_on_gce(self, m_fetcher):
+ self.m_platform_reports_gce.return_value = False
+ ret = self.ds.get_data()
+ self.assertEqual(False, ret)
+ m_fetcher.assert_not_called()
# vi: ts=4 expandtab