diff --git a/test/integration/test_autocomplete.py b/test/integration/test_autocomplete.py index 13a5b83f4..7650e838b 100644 --- a/test/integration/test_autocomplete.py +++ b/test/integration/test_autocomplete.py @@ -34,9 +34,10 @@ def bashrc(homedir): @pytest.fixture(scope="module") -def autocomplete_installed(env, homedir, bashrc, cli_version): +def autocomplete_installed(request, env, homedir, bashrc, cli_version): + command = request.config.getoption('--sut') shell = pexpect.spawn( - f'bash -i -c "{cli_version} install-autocomplete"', env=env, logfile=sys.stderr.buffer + f'bash -i -c "{command} install-autocomplete"', env=env, logfile=sys.stderr.buffer ) try: shell.expect_exact('Autocomplete successfully installed for bash', timeout=TIMEOUT) diff --git a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py index 6efd510c0..1dfd6cb1b 100755 --- a/test/integration/test_b2_command_line.py +++ b/test/integration/test_b2_command_line.py @@ -2665,14 +2665,15 @@ def test_upload_file__stdin_pipe_operator(request, bash_runner, b2_tool, bucket_ @skip_on_windows def test_upload_unbound_stream__redirect_operator( - request, bash_runner, b2_tool, bucket_name, is_running_on_docker, cli_version + request, bash_runner, b2_tool, bucket_name, is_running_on_docker ): """Test upload-unbound-stream from stdin using redirect operator.""" if is_running_on_docker: pytest.skip('Not supported on Docker') content = request.node.name + command = request.config.getoption('--sut') run = bash_runner( - f'{cli_version} upload-unbound-stream {bucket_name} <(echo -n {content}) {request.node.name}.txt' + f'{command} upload-unbound-stream {bucket_name} <(echo -n {content}) {request.node.name}.txt' ) assert hashlib.sha1(content.encode()).hexdigest() in run.stdout