ci_: pytest-lint correct target pr branch (#6230)
* ci_: pytest-lint correct target pr branch * fix_: format issues
This commit is contained in:
parent
d291204473
commit
b803918c2b
|
@ -3,7 +3,8 @@ name: Pytest Lint
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- develop
|
||||||
|
- release/**
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- "test-linting"
|
- "test-linting"
|
||||||
|
|
|
@ -93,10 +93,9 @@ class StatusBackend(RpcClient, SignalClient):
|
||||||
self.health(enable_logging=False)
|
self.health(enable_logging=False)
|
||||||
logging.info(f"StatusBackend is healthy after {time.time() - start_time} seconds")
|
logging.info(f"StatusBackend is healthy after {time.time() - start_time} seconds")
|
||||||
return
|
return
|
||||||
except Exception as e:
|
except Exception:
|
||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
raise TimeoutError(
|
raise TimeoutError(f"StatusBackend was not healthy after {timeout} seconds")
|
||||||
f"StatusBackend was not healthy after {timeout} seconds")
|
|
||||||
|
|
||||||
def health(self, enable_logging=True):
|
def health(self, enable_logging=True):
|
||||||
return self.api_request("health", data=[], url=self.base_url, enable_logging=enable_logging)
|
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)
|
return self.api_valid_request(method, data)
|
||||||
|
|
||||||
def _set_proxy_credentials(self, 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
|
return data
|
||||||
|
|
||||||
user = os.environ["STATUS_BUILD_PROXY_USER"]
|
user = os.environ["STATUS_BUILD_PROXY_USER"]
|
||||||
|
|
|
@ -24,7 +24,7 @@ class TestInitialiseApp:
|
||||||
|
|
||||||
assert backend_client is not None
|
assert backend_client is not None
|
||||||
backend_client.verify_json_schema(
|
backend_client.verify_json_schema(
|
||||||
backend_client.wait_for_login(),
|
backend_client.wait_for_login(),
|
||||||
"signal_node_login",
|
"signal_node_login",
|
||||||
)
|
)
|
||||||
backend_client.verify_json_schema(
|
backend_client.verify_json_schema(
|
||||||
|
|
Loading…
Reference in New Issue