"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ec2api/tests/unit/test_metadata.py" between
ec2-api-14.0.1.tar.gz and ec2-api-15.0.0.tar.gz

About: OpenStack EC2 API provides a standalone EC2 (and VPC) API service.
The "Zed" series (latest release).

test_metadata.py  (ec2-api-14.0.1)	:	test_metadata.py  (ec2-api-15.0.0)
skipping to change at line 21		skipping to change at line 21
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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
from unittest import mock		from unittest import mock
from oslo_config import cfg		from oslo_config import cfg
from oslo_config import fixture as config_fixture		from oslo_config import fixture as config_fixture
from oslotest import base as test_base		from oslotest import base as test_base
import six
import testtools		import testtools
import webob		import webob
from ec2api import exception		from ec2api import exception
from ec2api import metadata		from ec2api import metadata
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
class ProxyTestCase(test_base.BaseTestCase):		class ProxyTestCase(test_base.BaseTestCase):
skipping to change at line 368		skipping to change at line 367
'X-Forwarded-For': 'fake_instance_ip',		'X-Forwarded-For': 'fake_instance_ip',
'X-Instance-ID-Signature': sign})		'X-Instance-ID-Signature': sign})
self.handler._unpack_neutron_request(req)		self.handler._unpack_neutron_request(req)
self.assertEqual(1, constant_time_compare.call_count)		self.assertEqual(1, constant_time_compare.call_count)
@mock.patch('novaclient.client.Client')		@mock.patch('novaclient.client.Client')
@mock.patch('ec2api.db.api.IMPL')		@mock.patch('ec2api.db.api.IMPL')
@mock.patch('ec2api.metadata.api.instance_api')		@mock.patch('ec2api.metadata.api.instance_api')
@mock.patch('ec2api.metadata.MetadataRequestHandler._validate_signature')		@mock.patch('ec2api.metadata.MetadataRequestHandler._validate_signature')
def test_get_metadata_items(self, validate, instance_api, db_api, nova):		def test_get_metadata_items(self, validate, instance_api, db_api, nova):
FAKE_USER_DATA = u'fake_user_data-' + six.unichr(1071)		FAKE_USER_DATA = u'fake_user_data-' + chr(1071)
nova.return_value.servers.list.return_value = [		nova.return_value.servers.list.return_value = [
fakes.OSInstance(fakes.OS_INSTANCE_1)]		fakes.OSInstance(fakes.OS_INSTANCE_1)]
keypair = mock.Mock(public_key=fakes.PUBLIC_KEY_KEY_PAIR)		keypair = mock.Mock(public_key=fakes.PUBLIC_KEY_KEY_PAIR)
keypair.configure_mock(name=fakes.NAME_KEY_PAIR)		keypair.configure_mock(name=fakes.NAME_KEY_PAIR)
nova.return_value.keypairs.get.return_value = keypair		nova.return_value.keypairs.get.return_value = keypair
db_api.get_items_ids.return_value = [		db_api.get_items_ids.return_value = [
(fakes.ID_EC2_INSTANCE_1, fakes.ID_OS_INSTANCE_1)]		(fakes.ID_EC2_INSTANCE_1, fakes.ID_OS_INSTANCE_1)]
instance_api.describe_instances.return_value = {		instance_api.describe_instances.return_value = {
'reservationSet': [fakes.EC2_RESERVATION_1]}		'reservationSet': [fakes.EC2_RESERVATION_1]}
userDataValue = base64.b64encode(FAKE_USER_DATA.encode('utf-8'))		userDataValue = base64.b64encode(FAKE_USER_DATA.encode('utf-8'))
End of changes. 2 change blocks.
2 lines changed or deleted		1 lines changed or added

---