Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/auto-test/performance' into auto…
Browse files Browse the repository at this point in the history
…-test/performance
  • Loading branch information
MKLeb committed Dec 7, 2022
2 parents 59a0fff + 9e32816 commit 6940c6f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion tests/pytests/scenarios/performance/conftest.py
Expand Up @@ -69,7 +69,7 @@ def host_docker_network_ip_address(network):
@pytest.fixture(scope="session")
def salt_factories_config(salt_factories_config, host_docker_network_ip_address):
"""
Return a dictionary with the keyworkd arguments for FactoriesManager
Return a dictionary with the keyword arguments for FactoriesManager
"""
config = salt_factories_config.copy()
config["log_server_host"] = host_docker_network_ip_address
Expand Down
1 change: 0 additions & 1 deletion tests/pytests/scenarios/performance/test_performance.py
Expand Up @@ -324,7 +324,6 @@ def _wait_for_stdout(expected, func, *args, timeout=120, **kwargs):
start = time.time()
while time.time() < start + timeout:
ret = func(*args, **kwargs)
print(ret)
if ret and ret.stdout and expected in ret.stdout:
break
time.sleep(1)
Expand Down

0 comments on commit 6940c6f

Please sign in to comment.