From 6d91225651573ab19b81a4430bccfc85f05a8173 Mon Sep 17 00:00:00 2001 From: Alassane Yattara Date: Fri, 8 Dec 2023 02:56:33 +0100 Subject: bitbake: toaster/tests: Fixes warnings in autobuilder ../bitbake/lib/toaster/tests/functional/functional_helpers.py:66 /home/pokybuild/yocto-worker/toaster/build/bitbake/lib/toaster/tests/functional/functional_helpers.py:66: DeprecationWarning: invalid escape sequence '\s' project_url=re.search("(projectPageUrl\s:\s\")(.*)(\",)",rc) Traceback (most recent call last): File "/usr/lib/python3.10/threading.py", line 1016, in _bootstrap_inner self.run() File "/home/pokybuild/yocto-worker/toaster/build/bitbake/lib/toaster/tests/commands/test_runbuilds.py", line 39, in run os.kill(int(pid), signal.SIGTERM) ProcessLookupError: [Errno 3] No such process (Bitbake rev: 5a4732d5e4437cfc366c6b034868903ad6f0088c) Signed-off-by: Alassane Yattara Signed-off-by: Richard Purdie --- bitbake/lib/toaster/tests/commands/test_runbuilds.py | 13 ++++++++++--- bitbake/lib/toaster/tests/functional/functional_helpers.py | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/toaster/tests/commands/test_runbuilds.py b/bitbake/lib/toaster/tests/commands/test_runbuilds.py index c77d6cf490..738d36e98d 100644 --- a/bitbake/lib/toaster/tests/commands/test_runbuilds.py +++ b/bitbake/lib/toaster/tests/commands/test_runbuilds.py @@ -19,6 +19,10 @@ import time import subprocess import signal +import logging + + +logger = logging.getLogger("toaster") class KillRunbuilds(threading.Thread): """ Kill the runbuilds process after an amount of time """ @@ -34,9 +38,12 @@ class KillRunbuilds(threading.Thread): pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), ".runbuilds.pid") - with open(pidfile_path) as pidfile: - pid = pidfile.read() - os.kill(int(pid), signal.SIGTERM) + try: + with open(pidfile_path) as pidfile: + pid = pidfile.read() + os.kill(int(pid), signal.SIGTERM) + except ProcessLookupError: + logger.warning("Runbuilds not running or already killed") class TestCommands(TestCase): diff --git a/bitbake/lib/toaster/tests/functional/functional_helpers.py b/bitbake/lib/toaster/tests/functional/functional_helpers.py index c37c5f8d2f..d3e037a6d0 100644 --- a/bitbake/lib/toaster/tests/functional/functional_helpers.py +++ b/bitbake/lib/toaster/tests/functional/functional_helpers.py @@ -63,7 +63,7 @@ class SeleniumFunctionalTestCase(SeleniumTestCaseBase): def get_URL(self): rc=self.get_page_source() - project_url=re.search("(projectPageUrl\s:\s\")(.*)(\",)",rc) + project_url=re.search(r"(projectPageUrl\s:\s\")(.*)(\",)",rc) return project_url.group(2) -- cgit v1.2.3-54-g00ecf