From 97930016d93190787d6fb63a786668c413f47181 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 17 Aug 2018 06:32:12 +0100 Subject: [PATCH] Fix compat with Python >= 3.6 Provide a sane return value for get_keepalivedlvs_pid to ensure that underlying Python libary code does not throw a TypeError when joining values: TypeError: join() argument must be str or bytes, not 'MagicMock' Change-Id: I174bbaf618a845cc246f3b1926d600d03e710de3 --- .../amphorae/backends/agent/api_server/test_keepalivedlvs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py index e0359a68cb..d180d9d1f9 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py @@ -61,6 +61,7 @@ class KeepalivedLvsTestCase(base.TestCase): m_check_output, mget_pid, m_init_sys): m_exist.return_value = True + mget_pid.return_value = '0' self.assertRaises( util.UnknownInitError, self.test_keepalivedlvs.delete_udp_listener, self.FAKE_ID)