Merge pull request #2858 from johannaengland/fix-warning-integration-…

…tests Fix warnings during integration tests
Uninett · Mar 8, 2024 · 3c26402 · 3c26402
2 parents 0e9f9dc + 6e41330
commit 3c26402
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/nav/ipdevpoll/jobs.py b/python/nav/ipdevpoll/jobs.py
@@ -319,7 +319,7 @@ def log_abort(failure):
             return failure
 
         def save(result):
-            if self.cancelled.isSet():
+            if self.cancelled.is_set():
                 return wrap_up_job(result)
 
             df = self._save_container()
@@ -524,7 +524,7 @@ def _container_factory(self, container_class, key, *args, **kwargs):
 
     def _raise_if_cancelled(self):
         """Raises an AbortedJobError if the current job is cancelled"""
-        if self.cancelled.isSet():
+        if self.cancelled.is_set():
             raise AbortedJobError("Job was already cancelled")
 
     @classmethod

diff --git a/python/nav/statemon/db.py b/python/nav/statemon/db.py
@@ -73,7 +73,7 @@ class _DB(threading.Thread):
 
     def __init__(self):
         threading.Thread.__init__(self)
-        self.setDaemon(1)
+        self.daemon = True
         self.queue = queue.Queue()
         self._hosts_to_ping = []
         self._checkers = []