openstack/tempest
Code Issues Proposed changes

Merge "Remove xvpvnc console type tests"

Browse Source
This commit is contained in:
Zuul
2020-01-06 02:31:08 +00:00
committed by Gerrit Code Review
parent be76e2970e 8a64909be2
commit 4f8155cd59
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tempest/api/compute/servers/test_server_actions.py
View File

@@ -707,16 +707,13 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
@testtools.skipUnless(CONF.compute_feature_enabled.vnc_console, @testtools.skipUnless(CONF.compute_feature_enabled.vnc_console,
'VNC Console feature is disabled.') 'VNC Console feature is disabled.')
def test_get_vnc_console(self): def test_get_vnc_console(self):
# Get the VNC console of type 'novnc' and 'xvpvnc' if self.is_requested_microversion_compatible('2.5'):
console_types = ['novnc', 'xvpvnc'] body = self.client.get_vnc_console(
for console_type in console_types: self.server_id, type='novnc')['console']
if self.is_requested_microversion_compatible('2.5'): else:
body = self.client.get_vnc_console( body = self.client.get_remote_console(
self.server_id, type=console_type)['console'] self.server_id, console_type='novnc',
else: protocol='vnc')['remote_console']
body = self.client.get_remote_console( self.assertEqual('novnc', body['type'])
self.server_id, console_type=console_type, self.assertNotEqual('', body['url'])
protocol='vnc')['remote_console'] self._validate_url(body['url'])
self.assertEqual(console_type, body['type'])
self.assertNotEqual('', body['url'])
self._validate_url(body['url'])