c78a86c558
tests-functional-py3.txt:
* Remove all tests except snowman from blacklist
* snowman seems to be a gabbi problem under py35
nova/objects/resource_provider.py:
* Cannot compare None and integer under py35
* wrap keys() in a list before comparing to a list as
keys() is an iterator
nova/virt/fake.py:
* list_instance_uuids should return a list, keys() returns
an iterator.
nova/tests/functional/api_sample_tests/*.py:
* use response.text to compare with a string as response.context
contains bytes under python3
* user_data should be strings not bytes, so convert them
as necessary
nova/tests/functional/regressions/test_bug_1554631.py:
* cinder exceptions need the http code as the first parameter
(not a string)
* use response.text to compare with a string as response.context
contains bytes under python3
nova/tests/functional/test_servers.py:
* zlib.compress needs bytes
Change-Id: I73be94afbb02dac46467555a8469f222a69025da
51 lines
2.0 KiB
Python
51 lines
2.0 KiB
Python
# Copyright 2014 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
from nova.tests.functional.api_sample_tests import test_servers
|
|
from nova.tests.unit.api.openstack import fakes
|
|
|
|
|
|
class AssistedVolumeSnapshotsJsonTests(test_servers.ServersSampleBase):
|
|
sample_dir = "os-assisted-volume-snapshots"
|
|
|
|
def test_create(self):
|
|
"""Create a volume snapshots."""
|
|
self.stub_out('nova.compute.api.API.volume_snapshot_create',
|
|
fakes.stub_compute_volume_snapshot_create)
|
|
|
|
subs = {
|
|
'volume_id': '521752a6-acf6-4b2d-bc7a-119f9148cd8c',
|
|
'snapshot_id': '421752a6-acf6-4b2d-bc7a-119f9148cd8c',
|
|
'type': 'qcow2',
|
|
'new_file': 'new_file_name'
|
|
}
|
|
|
|
response = self._do_post("os-assisted-volume-snapshots",
|
|
"snapshot-create-assisted-req",
|
|
subs)
|
|
self._verify_response("snapshot-create-assisted-resp",
|
|
subs, response, 200)
|
|
|
|
def test_snapshots_delete_assisted(self):
|
|
self.stub_out('nova.compute.api.API.volume_snapshot_delete',
|
|
fakes.stub_compute_volume_snapshot_delete)
|
|
|
|
snapshot_id = '100'
|
|
response = self._do_delete(
|
|
'os-assisted-volume-snapshots/%s?delete_info='
|
|
'{"volume_id":"521752a6-acf6-4b2d-bc7a-119f9148cd8c"}'
|
|
% snapshot_id)
|
|
self.assertEqual(204, response.status_code)
|
|
self.assertEqual('', response.text)
|