diff --git a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py index 46b09b1ed6..44847844a2 100644 --- a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py +++ b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py @@ -169,8 +169,8 @@ class TestHealthDaemon(base.TestCase): mock_build_msg.side_effect = ['TEST', Exception('break')] test_queue = queue.Queue() - self.assertRaisesRegexp(Exception, 'break', - health_daemon.run_sender, test_queue) + self.assertRaisesRegex(Exception, 'break', + health_daemon.run_sender, test_queue) sender_mock.dosend.assert_called_once_with('TEST') @@ -178,8 +178,8 @@ class TestHealthDaemon(base.TestCase): mock_build_msg.reset_mock() mock_build_msg.side_effect = ['TEST', Exception('break')] test_queue.put('reload') - self.assertRaisesRegexp(Exception, 'break', - health_daemon.run_sender, test_queue) + self.assertRaisesRegex(Exception, 'break', + health_daemon.run_sender, test_queue) mock_reload_cfg.assert_called_once_with() # Test the shutdown path @@ -195,8 +195,8 @@ class TestHealthDaemon(base.TestCase): mock_build_msg.reset_mock() mock_build_msg.side_effect = ['TEST', Exception('break')] test_queue.put('bogus') - self.assertRaisesRegexp(Exception, 'break', - health_daemon.run_sender, test_queue) + self.assertRaisesRegex(Exception, 'break', + health_daemon.run_sender, test_queue) @mock.patch('octavia.amphorae.backends.utils.haproxy_query.HAProxyQuery') def test_get_stats(self, mock_query): diff --git a/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py b/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py index 0068d61ba4..67589a9e31 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py @@ -80,9 +80,9 @@ class QueryTestCase(base.TestCase): sock.recv.assert_called_with(1024) self.assertTrue(sock.close.called) - self.assertRaisesRegexp(Exception, - 'HAProxy \'test\' query failed.', - self.q._query, 'test') + self.assertRaisesRegex(Exception, + 'HAProxy \'test\' query failed.', + self.q._query, 'test') def test_get_pool_status(self): query_mock = mock.Mock() diff --git a/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py b/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py index 6f5e45b0b6..300dc94936 100644 --- a/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py +++ b/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py @@ -31,9 +31,9 @@ class TestHAproxyVRRPCheckCMD(base.TestCase): recv_mock.side_effect = [b'1', Exception('BREAK')] socket_mock.recv = recv_mock - self.assertRaisesRegexp(Exception, 'BREAK', - haproxy_vrrp_check.health_check, - '10.0.0.1') + self.assertRaisesRegex(Exception, 'BREAK', + haproxy_vrrp_check.health_check, + '10.0.0.1') @mock.patch('octavia.cmd.haproxy_vrrp_check.health_check') @mock.patch('sys.argv') diff --git a/octavia/tests/unit/cmd/test_health_manager.py b/octavia/tests/unit/cmd/test_health_manager.py index dee3825731..6f4e9b77ce 100644 --- a/octavia/tests/unit/cmd/test_health_manager.py +++ b/octavia/tests/unit/cmd/test_health_manager.py @@ -35,8 +35,8 @@ class TestHealthManagerCMD(base.TestCase): getter_mock.check = check_mock getter_mock.check.side_effect = [None, Exception('break')] mock_getter.return_value = getter_mock - self.assertRaisesRegexp(Exception, 'break', - health_manager.hm_listener) + self.assertRaisesRegex(Exception, 'break', + health_manager.hm_listener) mock_getter.assert_called_once_with(mock_health(), mock_stats()) self.assertEqual(2, getter_mock.check.call_count) @@ -48,8 +48,8 @@ class TestHealthManagerCMD(base.TestCase): hm_mock.health_check = health_check_mock hm_mock.health_check.side_effect = [None, Exception('break')] mock_health.return_value = hm_mock - self.assertRaisesRegexp(Exception, 'break', - health_manager.hm_health_check) + self.assertRaisesRegex(Exception, 'break', + health_manager.hm_health_check) mock_health.assert_called_once_with() self.assertEqual(2, hm_mock.health_check.call_count) diff --git a/octavia/tests/unit/cmd/test_house_keeping.py b/octavia/tests/unit/cmd/test_house_keeping.py index eb7c873235..701c3b56ff 100644 --- a/octavia/tests/unit/cmd/test_house_keeping.py +++ b/octavia/tests/unit/cmd/test_house_keeping.py @@ -37,8 +37,8 @@ class TestHouseKeepingCMD(base.TestCase): spare_amp_thread_event_mock.is_set.side_effect = [False, Exception('break')] - self.assertRaisesRegexp(Exception, 'break', - house_keeping.spare_amphora_check) + self.assertRaisesRegex(Exception, 'break', + house_keeping.spare_amphora_check) mock_SpareAmphora.assert_called_once_with() self.assertEqual(1, spare_amp_mock.spare_check.call_count) @@ -57,7 +57,7 @@ class TestHouseKeepingCMD(base.TestCase): db_cleanup_event_mock.is_set = mock.MagicMock() db_cleanup_event_mock.is_set.side_effect = [False, Exception('break')] - self.assertRaisesRegexp(Exception, 'break', house_keeping.db_cleanup) + self.assertRaisesRegex(Exception, 'break', house_keeping.db_cleanup) mock_DatabaseCleanup.assert_called_once_with() self.assertEqual(1, db_cleanup.delete_old_amphorae.call_count) @@ -80,8 +80,8 @@ class TestHouseKeepingCMD(base.TestCase): cert_rotate_event_mock.is_set = mock.MagicMock() cert_rotate_event_mock.is_set.side_effect = [False, Exception('break')] - self.assertRaisesRegexp(Exception, 'break', - house_keeping.cert_rotation) + self.assertRaisesRegex(Exception, 'break', + house_keeping.cert_rotation) mock_CertRotation.assert_called_once_with() self.assertEqual(1, cert_rotate_mock.rotate.call_count) @@ -134,7 +134,7 @@ class TestHouseKeepingCMD(base.TestCase): # mock the time.sleep() in the while loop sleep_time.side_effect = [True, Exception('break')] - self.assertRaisesRegexp(Exception, 'break', house_keeping.main) + self.assertRaisesRegex(Exception, 'break', house_keeping.main) spare_amp_thread_mock.start.assert_called_once_with() db_cleanup_thread_mock.start.assert_called_once_with()