From afcf34decc7dc55adc55ab366e03fbf472cd52ad Mon Sep 17 00:00:00 2001 From: Takashi Natsume Date: Wed, 24 Aug 2022 23:26:02 +0900 Subject: [PATCH] Use daemon property instead of setDaemon method The setDaemon method of the threading.Thread was deprecated in Python 3.10 (*). Replace the setDaemon method with the daemon property. *: https://docs.python.org/3.10/library/threading.html#threading.Thread.setDaemon Change-Id: I643251c0394b8e8ede8198f580549ef6f260a9de Signed-off-by: Takashi Natsume --- masakarimonitors/instancemonitor/instance.py | 2 +- masakarimonitors/introspectiveinstancemonitor/instance.py | 2 +- masakarimonitors/tests/unit/instancemonitor/test_instance.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/masakarimonitors/instancemonitor/instance.py b/masakarimonitors/instancemonitor/instance.py index 5bab3e7..fecf372 100644 --- a/masakarimonitors/instancemonitor/instance.py +++ b/masakarimonitors/instancemonitor/instance.py @@ -48,7 +48,7 @@ class InstancemonitorManager(manager.Manager): self.event_loop_thread = threading.Thread( target=self._vir_event_loop_native_run, name="lib_virt_eventLoop") - self.event_loop_thread.setDaemon(True) + self.event_loop_thread.daemon = True self.event_loop_thread.start() def _my_domain_event_callback(self, conn, dom, event, detail, opaque): diff --git a/masakarimonitors/introspectiveinstancemonitor/instance.py b/masakarimonitors/introspectiveinstancemonitor/instance.py index 6152907..f799f03 100644 --- a/masakarimonitors/introspectiveinstancemonitor/instance.py +++ b/masakarimonitors/introspectiveinstancemonitor/instance.py @@ -107,7 +107,7 @@ class IntrospectiveInstanceMonitorManager(manager.Manager): self.event_loop_thread = threading.Thread( target=self._vir_event_loop_native_run, name="lib_virt_eventLoop") - self.event_loop_thread.setDaemon(True) + self.event_loop_thread.daemon = True self.event_loop_thread.start() def _my_domain_event_callback(self, conn, dom, event, detail, opaque): diff --git a/masakarimonitors/tests/unit/instancemonitor/test_instance.py b/masakarimonitors/tests/unit/instancemonitor/test_instance.py index 2d28d7d..a8abfee 100644 --- a/masakarimonitors/tests/unit/instancemonitor/test_instance.py +++ b/masakarimonitors/tests/unit/instancemonitor/test_instance.py @@ -240,7 +240,7 @@ class TestInstancemonitorManager(testtools.TestCase): handlers_count = 9 self.assertTrue(exception_flag) mock_virEventRegisterDefaultImpl.assert_called_once() - mock_event_loop_thread.setDaemon.assert_called_once_with(True) + self.assertEqual(True, mock_event_loop_thread.daemon) mock_event_loop_thread.start.assert_called_once() mock_openAuth.assert_called_once_with( "qemu:///system",