Merge "test_cpu_pinning: Enable resize tests"

This commit is contained in:
Jenkins 2016-11-14 10:18:06 +00:00 committed by Gerrit Code Review
commit b9c251973d
1 changed files with 8 additions and 4 deletions

View File

@ -15,7 +15,6 @@
import libvirt
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
import testtools
import xml.etree.ElementTree as ET
@ -147,10 +146,17 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest):
return server
def _resize_server(self, server, flavor):
self.servers_client.resize(server['id'], flavor['id'])
self.servers_client.resize_server(server['id'], flavor['id'])
waiters.wait_for_server_status(self.servers_client, server['id'],
'VERIFY_RESIZE')
self.servers_client.confirm_resize_server(server['id'])
waiters.wait_for_server_status(self.servers_client, server['id'],
'ACTIVE')
# get more information
server = self.servers_client.show_server(server['id'])['server']
self.assertEqual(flavor['id'], server['flavor']['id'])
return server
@ -216,7 +222,6 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest):
sib.remove(pcpu)
self.assertFalse(set(sib).isdisjoint(cpu_pinnings.values()))
@decorators.skip_because(bug='0')
@testtools.skipUnless(CONF.compute_feature_enabled.resize,
'Resize not available.')
def test_resize_pinned_server_to_unpinned(self):
@ -233,7 +238,6 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest):
self.assertEqual(len(cpu_pinnings), 0)
@decorators.skip_because(bug='0')
@testtools.skipUnless(CONF.compute_feature_enabled.resize,
'Resize not available.')
def test_resize_unpinned_server_to_pinned(self):