Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warnings during integration tests #2858

Merged
merged 2 commits into from Mar 8, 2024
Merged

Fix warnings during integration tests #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d3c189
Fix deprecation warning by using is_set
johannaengland Mar 5, 2024
6e41330
Fix deprecation warning by setting daemon attribute
johannaengland Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/nav/ipdevpoll/jobs.py
View file
Open in desktop
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/nav/statemon/db.py
View file
Open in desktop
Expand Up @@ -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 = []
Expand Down