From b803918c2bf0a65c5f0266398138d67bf1768158 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Thu, 19 Dec 2024 12:07:40 +0000 Subject: [PATCH] ci_: pytest-lint correct target pr branch (#6230) * ci_: pytest-lint correct target pr branch * fix_: format issues --- .github/workflows/pytest-lint.yml | 3 ++- tests-functional/clients/status_backend.py | 7 +++---- tests-functional/tests/test_init_status_app.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest-lint.yml b/.github/workflows/pytest-lint.yml index ed3d833a8..d18fae132 100644 --- a/.github/workflows/pytest-lint.yml +++ b/.github/workflows/pytest-lint.yml @@ -3,7 +3,8 @@ name: Pytest Lint on: pull_request: branches: - - master + - develop + - release/** push: branches: - "test-linting" diff --git a/tests-functional/clients/status_backend.py b/tests-functional/clients/status_backend.py index c28f26daa..e6fdff492 100644 --- a/tests-functional/clients/status_backend.py +++ b/tests-functional/clients/status_backend.py @@ -93,10 +93,9 @@ class StatusBackend(RpcClient, SignalClient): self.health(enable_logging=False) logging.info(f"StatusBackend is healthy after {time.time() - start_time} seconds") return - except Exception as e: + except Exception: time.sleep(0.1) - raise TimeoutError( - f"StatusBackend was not healthy after {timeout} seconds") + raise TimeoutError(f"StatusBackend was not healthy after {timeout} seconds") def health(self, enable_logging=True): return self.api_request("health", data=[], url=self.base_url, enable_logging=enable_logging) @@ -139,7 +138,7 @@ class StatusBackend(RpcClient, SignalClient): return self.api_valid_request(method, data) def _set_proxy_credentials(self, data): - if not "STATUS_BUILD_PROXY_USER" in os.environ: + if "STATUS_BUILD_PROXY_USER" not in os.environ: return data user = os.environ["STATUS_BUILD_PROXY_USER"] diff --git a/tests-functional/tests/test_init_status_app.py b/tests-functional/tests/test_init_status_app.py index 51aa35876..64e1063e9 100644 --- a/tests-functional/tests/test_init_status_app.py +++ b/tests-functional/tests/test_init_status_app.py @@ -24,7 +24,7 @@ class TestInitialiseApp: assert backend_client is not None backend_client.verify_json_schema( - backend_client.wait_for_login(), + backend_client.wait_for_login(), "signal_node_login", ) backend_client.verify_json_schema(