test_metadata_api.py (ec2-api-14.0.1) | : | test_metadata_api.py (ec2-api-15.0.0) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
# See the License for the specific language governing permissions and | # See the License for the specific language governing permissions and | |||
# limitations under the License. | # limitations under the License. | |||
import base64 | import base64 | |||
import copy | import copy | |||
from unittest import mock | from unittest import mock | |||
from novaclient import exceptions as nova_exception | from novaclient import exceptions as nova_exception | |||
from oslo_cache import core as cache_core | from oslo_cache import core as cache_core | |||
from oslo_config import cfg | from oslo_config import cfg | |||
import six | ||||
from ec2api import exception | from ec2api import exception | |||
from ec2api.metadata import api | from ec2api.metadata import api | |||
from ec2api.tests.unit import base | from ec2api.tests.unit import base | |||
from ec2api.tests.unit import fakes | from ec2api.tests.unit import fakes | |||
from ec2api.tests.unit import matchers | from ec2api.tests.unit import matchers | |||
from ec2api.tests.unit import tools | from ec2api.tests.unit import tools | |||
CONF = cfg.CONF | CONF = cfg.CONF | |||
FAKE_USER_DATA = u'fake_user_data-' + six.unichr(1071) | FAKE_USER_DATA = u'fake_user_data-' + chr(1071) | |||
class MetadataApiTestCase(base.ApiTestCase): | class MetadataApiTestCase(base.ApiTestCase): | |||
# TODO(ft): 'execute' feature isn't used here, but some mocks and | # TODO(ft): 'execute' feature isn't used here, but some mocks and | |||
# fake context are. ApiTestCase should be split to some classes to use | # fake context are. ApiTestCase should be split to some classes to use | |||
# its feature optimally | # its feature optimally | |||
def setUp(self): | def setUp(self): | |||
super(MetadataApiTestCase, self).setUp() | super(MetadataApiTestCase, self).setUp() | |||
self.instance_api = self.mock('ec2api.metadata.api.instance_api') | self.instance_api = self.mock('ec2api.metadata.api.instance_api') | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added |