Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions queue_job/jobrunner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,16 @@ def __init__(
self._stop = False
self._stop_pipe = os.pipe()

def __del__(self):
try:
os.close(self._stop_pipe[0])
except OSError:
pass
try:
os.close(self._stop_pipe[1])
except OSError:
pass

@classmethod
def from_environ_or_config(cls):
scheme = os.environ.get("ODOO_QUEUE_JOB_SCHEME") or queue_job_config.get(
Expand Down
49 changes: 49 additions & 0 deletions queue_job/tests/test_runner_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,57 @@

# pylint: disable=odoo-addons-relative-import
# we are testing, we want to test as we were an external consumer of the API
import os

from odoo.tests import BaseCase, tagged

from odoo.addons.queue_job.jobrunner import runner

from .common import load_doctests

load_tests = load_doctests(runner)


@tagged("-at_install", "post_install")
class TestRunner(BaseCase):
@classmethod
def _is_open_file_descriptor(cls, fd):
try:
os.fstat(fd)
return True
except OSError:
return False

def test_runner_file_descriptor(self):
a_runner = runner.QueueJobRunner.from_environ_or_config()

read_fd, write_fd = a_runner._stop_pipe
self.assertTrue(self._is_open_file_descriptor(read_fd))
self.assertTrue(self._is_open_file_descriptor(write_fd))

del a_runner

self.assertFalse(self._is_open_file_descriptor(read_fd))
self.assertFalse(self._is_open_file_descriptor(write_fd))

def test_runner_file_closed_read_descriptor(self):
a_runner = runner.QueueJobRunner.from_environ_or_config()

read_fd, write_fd = a_runner._stop_pipe
os.close(read_fd)

del a_runner

self.assertFalse(self._is_open_file_descriptor(read_fd))
self.assertFalse(self._is_open_file_descriptor(write_fd))

def test_runner_file_closed_write_descriptor(self):
a_runner = runner.QueueJobRunner.from_environ_or_config()

read_fd, write_fd = a_runner._stop_pipe
os.close(write_fd)

del a_runner

self.assertFalse(self._is_open_file_descriptor(read_fd))
self.assertFalse(self._is_open_file_descriptor(write_fd))