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
50 lines
1.8 KiB
Python
50 lines
1.8 KiB
Python
# Copyright 2012 Nebula, Inc.
|
|
# Copyright 2013 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.
|
|
|
|
|
|
import nova.conf
|
|
from nova.tests.functional.api_sample_tests import test_servers
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class ShelveJsonTest(test_servers.ServersSampleBase):
|
|
sample_dir = "os-shelve"
|
|
|
|
def setUp(self):
|
|
super(ShelveJsonTest, self).setUp()
|
|
# Don't offload instance, so we can test the offload call.
|
|
CONF.set_override('shelved_offload_time', -1)
|
|
|
|
def _test_server_action(self, uuid, template, action):
|
|
response = self._do_post('servers/%s/action' % uuid,
|
|
template, {'action': action})
|
|
self.assertEqual(202, response.status_code)
|
|
self.assertEqual("", response.text)
|
|
|
|
def test_shelve(self):
|
|
uuid = self._post_server()
|
|
self._test_server_action(uuid, 'os-shelve', 'shelve')
|
|
|
|
def test_shelve_offload(self):
|
|
uuid = self._post_server()
|
|
self._test_server_action(uuid, 'os-shelve', 'shelve')
|
|
self._test_server_action(uuid, 'os-shelve-offload', 'shelveOffload')
|
|
|
|
def test_unshelve(self):
|
|
uuid = self._post_server()
|
|
self._test_server_action(uuid, 'os-shelve', 'shelve')
|
|
self._test_server_action(uuid, 'os-unshelve', 'unshelve')
|