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.

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

ci_: pytest-lint correct target pr branch #6230

Merged
merged 2 commits into from
Dec 19, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/pytest-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Pytest Lint
on:
pull_request:
branches:
- master
- develop
- release/**
push:
branches:
- "test-linting"
Expand Down
7 changes: 3 additions & 4 deletions tests-functional/clients/status_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ def wait_for_healthy(self, timeout=10):
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)
Expand Down Expand Up @@ -139,7 +138,7 @@ def init_status_backend(self, data_dir=USER_DIR):
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"]
Expand Down
2 changes: 1 addition & 1 deletion tests-functional/tests/test_init_status_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_init_app(self):

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(
Expand Down
Loading