e15ae76064
The Nova project now has clean tox py34 runs with a limited set of the UT. This change set fixes two existing py34 issues and allows py34 to run cleanly. The fixed issues are: - Use the 'builtins' module instead of __builtin__. - Don't log exceptions before they are raised. Change-Id: Ib66e36c54353833b8ec35ff6f34b3cd81d609334
64 lines
2.2 KiB
Python
64 lines
2.2 KiB
Python
# Copyright 2015 IBM Corp.
|
|
#
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
import six
|
|
|
|
from nova import test
|
|
|
|
from nova_powervm.virt.powervm import image
|
|
|
|
if six.PY2:
|
|
_BUILTIN = '__builtin__'
|
|
else:
|
|
_BUILTIN = 'builtins'
|
|
|
|
|
|
class TestImage(test.TestCase):
|
|
|
|
@mock.patch('nova.utils.temporary_chown')
|
|
@mock.patch(_BUILTIN + '.open')
|
|
@mock.patch('nova.image.api.API')
|
|
def test_stream_blockdev_to_glance(self, mock_api, mock_open, mock_chown):
|
|
mock_open.return_value.__enter__.return_value = 'mock_stream'
|
|
image.stream_blockdev_to_glance('context', mock_api, 'image_id',
|
|
'metadata', '/dev/disk')
|
|
mock_chown.assert_called_with('/dev/disk')
|
|
mock_open.assert_called_with('/dev/disk', 'rb')
|
|
mock_api.update.assert_called_with('context', 'image_id', 'metadata',
|
|
'mock_stream')
|
|
|
|
@mock.patch('nova.image.api.API')
|
|
def test_snapshot_metadata(self, mock_api):
|
|
mock_api.get.return_value = {'name': 'image_name'}
|
|
mock_instance = mock.Mock()
|
|
mock_instance.project_id = 'project_id'
|
|
ret = image.snapshot_metadata('context', mock_api, 'image_id',
|
|
mock_instance)
|
|
mock_api.get.assert_called_with('context', 'image_id')
|
|
self.assertEqual({
|
|
'name': 'image_name',
|
|
'is_public': False,
|
|
'status': 'active',
|
|
'disk_format': 'raw',
|
|
'container_format': 'bare',
|
|
'properties': {
|
|
'image_location': 'snapshot',
|
|
'image_state': 'available',
|
|
'owner_id': 'project_id',
|
|
}
|
|
}, ret)
|