openstack/nova
Code Issues Proposed changes

Merge "Remove invalid test methods for config option port_range"

Browse Source
This commit is contained in:
Jenkins
2016-07-09 03:58:21 +00:00
committed by Gerrit Code Review
parent 8f1ddd4f0e 0a471bb06d
commit 92c8b2045a
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/console/serial.py
View File

@@ -67,14 +67,13 @@ def release_port(host, port):
def _get_port_range(): def _get_port_range():
config_range = CONF.serial_console.port_range config_range = CONF.serial_console.port_range
try:
start, stop = map(int, config_range.split(':')) start, stop = map(int, config_range.split(':'))
if start >= stop: if start >= stop:
raise ValueError
except ValueError:
default_port_range = nova.conf.serial_console.DEFAULT_PORT_RANGE default_port_range = nova.conf.serial_console.DEFAULT_PORT_RANGE
LOG.warning(_LW("serial_console.port_range should be <num>:<num>. " LOG.warning(_LW("serial_console.port_range should be in the "
"Given value %(port_range)s could not be parsed. " "format <start>:<stop> and start < stop, "
"Given value %(port_range)s is invalid. "
"Taking the default port range %(default)s."), "Taking the default port range %(default)s."),
{'port_range': config_range, {'port_range': config_range,
'default': default_port_range}) 'default': default_port_range})

12
nova/tests/unit/console/test_serial.py
View File

@@ -46,18 +46,6 @@ class SerialTestCase(test.NoDBTestCase):
self.assertEqual(10000, start) self.assertEqual(10000, start)
self.assertEqual(20000, stop) self.assertEqual(20000, stop)
def test_get_port_range_not_numeric(self):
self.flags(port_range='xxx:yyy', group='serial_console')
start, stop = serial._get_port_range()
self.assertEqual(10000, start)
self.assertEqual(20000, stop)
def test_get_port_range_invalid_syntax(self):
self.flags(port_range='10:20:30', group='serial_console')
start, stop = serial._get_port_range()
self.assertEqual(10000, start)
self.assertEqual(20000, stop)
@mock.patch('socket.socket') @mock.patch('socket.socket')
def test_verify_port(self, fake_socket): def test_verify_port(self, fake_socket):
s = mock.MagicMock() s = mock.MagicMock()