diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:27 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:27 -0600 |
| commit | ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524 (patch) | |
| tree | 5b68f0602daea648d48b3dc16809b0d66fb565d1 /tests/unittests/test_datasource/test_aliyun.py | |
| parent | 7d1e8976bba629f30da45e814a5a97e2f4b7de3d (diff) | |
| parent | 2d6e4219db73e80c135efd83753f9302f778f08d (diff) | |
| download | vyos-cloud-init-ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524.tar.gz vyos-cloud-init-ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524.zip | |
merge from master at 18.3
Diffstat (limited to 'tests/unittests/test_datasource/test_aliyun.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_aliyun.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_aliyun.py b/tests/unittests/test_datasource/test_aliyun.py index 4fa9616b..1e77842f 100644 --- a/tests/unittests/test_datasource/test_aliyun.py +++ b/tests/unittests/test_datasource/test_aliyun.py @@ -130,7 +130,6 @@ class TestAliYunDatasource(test_helpers.HttprettyTestCase): self.ds.get_hostname()) @mock.patch("cloudinit.sources.DataSourceAliYun._is_aliyun") - @httpretty.activate def test_with_mock_server(self, m_is_aliyun): m_is_aliyun.return_value = True self.regist_default_server() @@ -143,7 +142,6 @@ class TestAliYunDatasource(test_helpers.HttprettyTestCase): self._test_host_name() @mock.patch("cloudinit.sources.DataSourceAliYun._is_aliyun") - @httpretty.activate def test_returns_false_when_not_on_aliyun(self, m_is_aliyun): """If is_aliyun returns false, then get_data should return False.""" m_is_aliyun.return_value = False |