diff options
author | Scott Moser <smoser@brickies.net> | 2016-10-04 16:44:29 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-10-04 16:44:29 -0400 |
commit | c83e19dc07b284f008120fb0c72439c5f91042ae (patch) | |
tree | a368cbb9170b2da6ffb623802580381b12bae4be /tests | |
parent | 1bf130a7e1157d83f073131beaa92d3169255229 (diff) | |
parent | 94fd35eeb3f53bc82fb9ddcad60c1e605890fd53 (diff) | |
download | vyos-cloud-init-c83e19dc07b284f008120fb0c72439c5f91042ae.tar.gz vyos-cloud-init-c83e19dc07b284f008120fb0c72439c5f91042ae.zip |
merge from master at 0.7.8-14-g94fd35e
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unittests/test_datasource/test_digitalocean.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_digitalocean.py b/tests/unittests/test_datasource/test_digitalocean.py index bdfe0ba2..7bde0820 100644 --- a/tests/unittests/test_datasource/test_digitalocean.py +++ b/tests/unittests/test_datasource/test_digitalocean.py @@ -162,7 +162,7 @@ class TestDataSourceDigitalOcean(TestCase): m_read_sysinfo.return_value = (False, None) ds = self.get_ds(get_sysinfo=None) self.assertEqual(False, ds.get_data()) - m_read_sysinfo.assert_called() + self.assertTrue(m_read_sysinfo.called) @mock.patch('cloudinit.sources.helpers.digitalocean.read_metadata') def test_metadata(self, mock_readmd): @@ -172,7 +172,7 @@ class TestDataSourceDigitalOcean(TestCase): ret = ds.get_data() self.assertTrue(ret) - mock_readmd.assert_called() + self.assertTrue(mock_readmd.called) self.assertEqual(DO_META.get('user_data'), ds.get_userdata_raw()) self.assertEqual(DO_META.get('vendor_data'), ds.get_vendordata_raw()) @@ -196,7 +196,7 @@ class TestDataSourceDigitalOcean(TestCase): ret = ds.get_data() self.assertTrue(ret) - mock_readmd.assert_called() + self.assertTrue(mock_readmd.called) # Multiple keys self.assertEqual(metadata['public_keys'], ds.get_public_ssh_keys()) |