Merge "tests: Keep port number in valid range"

This commit is contained in:
Zuul
2025-05-31 00:46:06 +00:00
committed by Gerrit Code Review

View File

@@ -90,19 +90,19 @@ class TestObjectUpdater(unittest.TestCase):
'replication_ip': '127.0.0.1', 'replication_ip': '127.0.0.1',
# replication_port may be overridden in tests but # replication_port may be overridden in tests but
# include here for completeness... # include here for completeness...
'replication_port': 67890, 'replication_port': 60789,
'device': 'sda1', 'zone': 0}, 'device': 'sda1', 'zone': 0},
{'id': 1, 'ip': '127.0.0.2', 'port': 1, {'id': 1, 'ip': '127.0.0.2', 'port': 1,
'replication_ip': '127.0.0.1', 'replication_ip': '127.0.0.1',
'replication_port': 67890, 'replication_port': 60789,
'device': 'sda1', 'zone': 2}, 'device': 'sda1', 'zone': 2},
{'id': 2, 'ip': '127.0.0.2', 'port': 1, {'id': 2, 'ip': '127.0.0.2', 'port': 1,
'replication_ip': '127.0.0.1', 'replication_ip': '127.0.0.1',
'replication_port': 67890, 'replication_port': 60789,
'device': 'sda1', 'zone': 4}, 'device': 'sda1', 'zone': 4},
{'id': 3, 'ip': '127.0.0.2', 'port': 1, {'id': 3, 'ip': '127.0.0.2', 'port': 1,
'replication_ip': '127.0.0.1', 'replication_ip': '127.0.0.1',
'replication_port': 67890, 'replication_port': 60789,
'device': 'sda1', 'zone': 6}], 30), 'device': 'sda1', 'zone': 6}], 30),
f) f)
self.devices_dir = os.path.join(self.testdir, 'devices') self.devices_dir = os.path.join(self.testdir, 'devices')
@@ -750,7 +750,7 @@ class TestObjectUpdater(unittest.TestCase):
{'failures': 1, 'outdated_unlinks': 1}) {'failures': 1, 'outdated_unlinks': 1})
self.assertIsNone(pickle.load(open(op_path, 'rb')).get('successes')) self.assertIsNone(pickle.load(open(op_path, 'rb')).get('successes'))
self.assertEqual( self.assertEqual(
['ERROR with remote server 127.0.0.1:67890/sda1: ' ['ERROR with remote server 127.0.0.1:60789/sda1: '
'Connection refused'] * 3, 'Connection refused'] * 3,
ou.logger.get_lines_for_level('error')) ou.logger.get_lines_for_level('error'))
self.assertEqual( self.assertEqual(