diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
| commit | 7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e (patch) | |
| tree | 0ebb51599a0024b2507811697bfe965e66ac29e1 /tests/unittests/test_datasource/test_openstack.py | |
| parent | 7d20f3843bff0069b1ac9b2f0c6d346889789058 (diff) | |
| parent | 1db41a6f5283d38dff6de0b0421d51eac869a39c (diff) | |
| download | vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.tar.gz vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.zip | |
Update with trunk and resolve conflicts
Diffstat (limited to 'tests/unittests/test_datasource/test_openstack.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_openstack.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py index 7b4e651a..49894e51 100644 --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py @@ -19,7 +19,6 @@ import copy import json import re -import unittest from StringIO import StringIO @@ -318,7 +317,7 @@ class TestOpenStackDataSource(test_helpers.HttprettyTestCase): self.assertIsNone(ds_os.version) -class TestVendorDataLoading(unittest.TestCase): +class TestVendorDataLoading(test_helpers.TestCase): def cvj(self, data): return openstack.convert_vendordata_json(data) |