openstack
/
nova
Code Issues Proposed changes

Merge "tests: Use consistent URL regex substitution"

This commit is contained in:
Zuul 2019-11-22 19:53:02 +00:00 committed by Gerrit Code Review
parent a1b0c8b814 4cd45c8e45
commit f6ad0765c9
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nova/tests/functional/api_sample_tests/test_remote_consoles.py
View File

@ -15,6 +15,8 @@
from nova.tests.functional.api_sample_tests import test_servers from nova.tests.functional.api_sample_tests import test_servers
HTTP_RE = r'(https?://)([\w\d:#@%/;$()~_?\+-=\\.&](#!)?)*'
class ConsolesSampleJsonTests(test_servers.ServersSampleBase): class ConsolesSampleJsonTests(test_servers.ServersSampleBase):
microversion = None microversion = None
@ -33,18 +35,15 @@ class ConsolesSampleJsonTests(test_servers.ServersSampleBase):
response = self._do_post('servers/%s/action' % uuid, response = self._do_post('servers/%s/action' % uuid,
'get-vnc-console-post-req', 'get-vnc-console-post-req',
{'action': 'os-getVNCConsole'}) {'action': 'os-getVNCConsole'})
subs = {"url": self._verify_response('get-vnc-console-post-resp', {'url': HTTP_RE},
"((https?):((//)|(\\\\))+([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*)"} response, 200)
self._verify_response('get-vnc-console-post-resp', subs, response, 200)
def test_get_spice_console(self): def test_get_spice_console(self):
uuid = self._post_server() uuid = self._post_server()
response = self._do_post('servers/%s/action' % uuid, response = self._do_post('servers/%s/action' % uuid,
'get-spice-console-post-req', 'get-spice-console-post-req',
{'action': 'os-getSPICEConsole'}) {'action': 'os-getSPICEConsole'})
subs = {"url": self._verify_response('get-spice-console-post-resp', {'url': HTTP_RE},
"((https?):((//)|(\\\\))+([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*)"}
self._verify_response('get-spice-console-post-resp', subs,
response, 200) response, 200)
def test_get_rdp_console(self): def test_get_rdp_console(self):
@ -52,9 +51,7 @@ class ConsolesSampleJsonTests(test_servers.ServersSampleBase):
response = self._do_post('servers/%s/action' % uuid, response = self._do_post('servers/%s/action' % uuid,
'get-rdp-console-post-req', 'get-rdp-console-post-req',
{'action': 'os-getRDPConsole'}) {'action': 'os-getRDPConsole'})
subs = {"url": self._verify_response('get-rdp-console-post-resp', {'url': HTTP_RE},
"((https?):((//)|(\\\\))+([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*)"}
self._verify_response('get-rdp-console-post-resp', subs,
response, 200) response, 200)
def test_get_serial_console(self): def test_get_serial_console(self):
@ -62,9 +59,7 @@ class ConsolesSampleJsonTests(test_servers.ServersSampleBase):
response = self._do_post('servers/%s/action' % uuid, response = self._do_post('servers/%s/action' % uuid,
'get-serial-console-post-req', 'get-serial-console-post-req',
{'action': 'os-getSerialConsole'}) {'action': 'os-getSerialConsole'})
subs = {"url": self._verify_response('get-serial-console-post-resp', {'url': HTTP_RE},
"((https?):((//)|(\\\\))+([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*)"}
self._verify_response('get-serial-console-post-resp', subs,
response, 200) response, 200)
@ -76,18 +71,14 @@ class ConsolesV26SampleJsonTests(test_servers.ServersSampleBase):
# by appending '(v2_6)' in test_id. # by appending '(v2_6)' in test_id.
scenarios = [('v2_6', {'api_major_version': 'v2.1'})] scenarios = [('v2_6', {'api_major_version': 'v2.1'})]
def setUp(self):
super(ConsolesV26SampleJsonTests, self).setUp()
self.http_regex = '(https?://)([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*'
def test_create_console(self): def test_create_console(self):
uuid = self._post_server() uuid = self._post_server()
body = {'protocol': 'vnc', 'type': 'novnc'} body = {'protocol': 'vnc', 'type': 'novnc'}
response = self._do_post('servers/%s/remote-consoles' % uuid, response = self._do_post('servers/%s/remote-consoles' % uuid,
'create-vnc-console-req', body) 'create-vnc-console-req', body)
subs = {"url": self.http_regex} self._verify_response('create-vnc-console-resp', {'url': HTTP_RE},
self._verify_response('create-vnc-console-resp', subs, response, 200) response, 200)
class ConsolesV28SampleJsonTests(test_servers.ServersSampleBase): class ConsolesV28SampleJsonTests(test_servers.ServersSampleBase):
@ -97,7 +88,6 @@ class ConsolesV28SampleJsonTests(test_servers.ServersSampleBase):
def setUp(self): def setUp(self):
super(ConsolesV28SampleJsonTests, self).setUp() super(ConsolesV28SampleJsonTests, self).setUp()
self.http_regex = '(https?://)([\\w\\d:#@%/;$()~_?\\+-=\\\\.&](#!)?)*'
self.flags(enabled=True, group='mks') self.flags(enabled=True, group='mks')
def test_create_mks_console(self): def test_create_mks_console(self):
@ -106,5 +96,5 @@ class ConsolesV28SampleJsonTests(test_servers.ServersSampleBase):
body = {'protocol': 'mks', 'type': 'webmks'} body = {'protocol': 'mks', 'type': 'webmks'}
response = self._do_post('servers/%s/remote-consoles' % uuid, response = self._do_post('servers/%s/remote-consoles' % uuid,
'create-mks-console-req', body) 'create-mks-console-req', body)
subs = {"url": self.http_regex} self._verify_response('create-mks-console-resp', {'url': HTTP_RE},
self._verify_response('create-mks-console-resp', subs, response, 200) response, 200)