diff --git a/tests/commands/test_invoke_empty_upload.py b/tests/commands/test_invoke_empty_upload.py index d38a1a794..4b8c19ded 100644 --- a/tests/commands/test_invoke_empty_upload.py +++ b/tests/commands/test_invoke_empty_upload.py @@ -11,7 +11,7 @@ def test_invoke_empty_upload_with_create_commit(mocker): fake_ci_provider = FakeProvider({FallbackFieldEnum.commit_sha: None}) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["empty-upload", "-C", "command-sha", "--slug", "owner/repo", diff --git a/tests/commands/test_invoke_labelanalysis.py b/tests/commands/test_invoke_labelanalysis.py index d5eeaa28f..f2c9cd45f 100644 --- a/tests/commands/test_invoke_labelanalysis.py +++ b/tests/commands/test_invoke_labelanalysis.py @@ -136,7 +136,7 @@ def test_parse_dynamic_runner_options(self): class TestLabelAnalysisCommand(object): def test_invoke_label_analysis_missing_token(self, mocker, fake_ci_provider): mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["label-analysis"], obj={}) print(result.output) @@ -145,7 +145,7 @@ def test_invoke_label_analysis_missing_token(self, mocker, fake_ci_provider): def test_invoke_label_analysis_missing_base_sha(self, mocker, fake_ci_provider): mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["label-analysis", "--token=STATIC_TOKEN"], obj={}) print(result.output) @@ -156,7 +156,7 @@ def test_invoke_label_analysis_base_sha_same_as_head_sha( self, mocker, fake_ci_provider ): mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, diff --git a/tests/commands/test_invoke_upload.py b/tests/commands/test_invoke_upload.py index 68b928d9e..00bb1c9b6 100644 --- a/tests/commands/test_invoke_upload.py +++ b/tests/commands/test_invoke_upload.py @@ -15,7 +15,7 @@ def test_upload_missing_commit_sha(mocker, use_verbose_option): "codecov_cli.main.get_versioning_system", return_value=fake_versioning_system ) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["do-upload"], obj={}) assert result.exit_code != 0 print(result.output) @@ -36,7 +36,7 @@ def test_upload_raise_Z_option(mocker): fake_ci_provider = FakeProvider({FallbackFieldEnum.commit_sha: None}) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["do-upload", "--fail-on-error"], obj={}) upload_sender.assert_called() upload_collector.assert_called() diff --git a/tests/commands/test_invoke_upload_coverage.py b/tests/commands/test_invoke_upload_coverage.py index 1084c4c46..2705ff34b 100644 --- a/tests/commands/test_invoke_upload_coverage.py +++ b/tests/commands/test_invoke_upload_coverage.py @@ -15,7 +15,7 @@ def test_upload_coverage_missing_commit_sha(mocker): "codecov_cli.main.get_versioning_system", return_value=fake_versioning_system ) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolated_filesystem(): result = runner.invoke(cli, ["upload-coverage"], obj={}) assert result.exit_code != 0 @@ -29,7 +29,7 @@ def test_upload_coverage_raise_Z_option(mocker, use_verbose_option): error=error, warnings=[], status_code=401, text="Unauthorized" ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolated_filesystem(): with patch( "codecov_cli.services.commit.send_commit_data" @@ -56,11 +56,11 @@ def test_upload_coverage_raise_Z_option(mocker, use_verbose_option): def test_upload_coverage_options(mocker): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) fake_ci_provider = FakeProvider({FallbackFieldEnum.commit_sha: None}) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) with runner.isolated_filesystem(): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["upload-coverage", "-h"], obj={}) assert result.exit_code == 0 print(result.output) diff --git a/tests/commands/test_invoke_upload_process.py b/tests/commands/test_invoke_upload_process.py index e5421d3fc..bfbb6cc9c 100644 --- a/tests/commands/test_invoke_upload_process.py +++ b/tests/commands/test_invoke_upload_process.py @@ -15,7 +15,7 @@ def test_upload_process_missing_commit_sha(mocker): "codecov_cli.main.get_versioning_system", return_value=fake_versioning_system ) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolated_filesystem(): result = runner.invoke(cli, ["upload-process"], obj={}) assert result.exit_code != 0 @@ -29,7 +29,7 @@ def test_upload_process_raise_Z_option(mocker, use_verbose_option): error=error, warnings=[], status_code=401, text="Unauthorized" ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolated_filesystem(): with patch( "codecov_cli.services.commit.send_commit_data" @@ -56,11 +56,11 @@ def test_upload_process_raise_Z_option(mocker, use_verbose_option): def test_upload_process_options(mocker): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) fake_ci_provider = FakeProvider({FallbackFieldEnum.commit_sha: None}) mocker.patch("codecov_cli.main.get_ci_adapter", return_value=fake_ci_provider) with runner.isolated_filesystem(): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["upload-process", "-h"], obj={}) assert result.exit_code == 0 print(result.output) diff --git a/tests/commands/test_process_test_results.py b/tests/commands/test_process_test_results.py index ea9faabae..41ea37a67 100644 --- a/tests/commands/test_process_test_results.py +++ b/tests/commands/test_process_test_results.py @@ -26,7 +26,7 @@ def test_process_test_results( status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -68,7 +68,7 @@ def test_process_test_results_create_github_message( status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -138,7 +138,7 @@ def test_process_test_results_update_github_message( status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -189,7 +189,7 @@ def test_process_test_results_errors_getting_comments( status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -222,7 +222,7 @@ def test_process_test_results_non_existent_file(mocker, tmpdir): status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -260,7 +260,7 @@ def test_process_test_results_missing_repo(mocker, tmpdir): status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ @@ -301,7 +301,7 @@ def test_process_test_results_missing_ref(mocker, tmpdir): status_code=200, error=None, warnings=[], text="yay it worked" ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( cli, [ diff --git a/tests/commands/test_upload_token_discovery.py b/tests/commands/test_upload_token_discovery.py index 5080d567f..0ca4d4b0f 100644 --- a/tests/commands/test_upload_token_discovery.py +++ b/tests/commands/test_upload_token_discovery.py @@ -41,6 +41,6 @@ def test_no_cli_token_config_fallback( mocker.patch.object(upload, "do_upload_logic") do_upload_cmd_spy = mocker.spy(upload, "do_upload_logic") - CliRunner().invoke(cli, ["do-upload", "--commit-sha=deadbeef"], obj={}) + CliRunner(mix_stderr=False).invoke(cli, ["do-upload", "--commit-sha=deadbeef"], obj={}) assert do_upload_cmd_spy.call_args[-1]["token"] == "sentinel-value" diff --git a/tests/services/commit/test_base_picking.py b/tests/services/commit/test_base_picking.py index 2c295fe25..95840a307 100644 --- a/tests/services/commit/test_base_picking.py +++ b/tests/services/commit/test_base_picking.py @@ -14,7 +14,7 @@ def test_base_picking_command(mocker): return_value=RequestResult(status_code=200, error=None, warnings=[], text=""), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( pr_base_picking, [ @@ -37,7 +37,7 @@ def test_base_picking_command(mocker): def test_base_picking_command_slug_invalid(mocker): token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( pr_base_picking, [ @@ -72,7 +72,7 @@ def test_base_picking_command_warnings(mocker): ), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( pr_base_picking, [ @@ -116,7 +116,7 @@ def test_base_picking_command_error(mocker): ), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( pr_base_picking, [ @@ -146,7 +146,7 @@ def test_base_picking_no_token(mocker): "codecov_cli.services.commit.base_picking.send_put_request", return_value=RequestResult(status_code=200, error=None, warnings=[], text=""), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke( pr_base_picking, [ diff --git a/tests/services/commit/test_commit_service.py b/tests/services/commit/test_commit_service.py index 392d2377e..139cb44cd 100644 --- a/tests/services/commit/test_commit_service.py +++ b/tests/services/commit/test_commit_service.py @@ -20,7 +20,7 @@ def test_commit_command_with_warnings(mocker): text="", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_commit_logic( commit_sha="commit_sha", @@ -66,7 +66,7 @@ def test_commit_command_with_error(mocker): text="Permission denied", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_commit_logic( commit_sha="commit_sha", diff --git a/tests/services/empty_upload/test_empty_upload.py b/tests/services/empty_upload/test_empty_upload.py index 71c1052b4..d18a716fa 100644 --- a/tests/services/empty_upload/test_empty_upload.py +++ b/tests/services/empty_upload/test_empty_upload.py @@ -20,7 +20,7 @@ def test_empty_upload_with_warnings(mocker): text="", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = empty_upload_logic( "commit_sha", @@ -56,7 +56,7 @@ def test_empty_upload_with_error(mocker): text="Permission denied", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = empty_upload_logic( "commit_sha", @@ -90,7 +90,7 @@ def test_empty_upload_200(mocker): ), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = empty_upload_logic( "commit_sha", "owner/repo", token, "github", None, False, False, None @@ -135,7 +135,7 @@ def test_empty_upload_force(mocker): ), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = empty_upload_logic( "commit_sha", "owner/repo", token, "github", None, False, True, None @@ -162,7 +162,7 @@ def test_empty_upload_no_token(mocker): status_code=200, error=None, warnings=[], text=json.dumps(res) ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = empty_upload_logic( "commit_sha", "owner/repo", None, "github", None, False, False, None diff --git a/tests/services/report/test_report_results.py b/tests/services/report/test_report_results.py index 50b97110b..68201996f 100644 --- a/tests/services/report/test_report_results.py +++ b/tests/services/report/test_report_results.py @@ -22,7 +22,7 @@ def test_report_results_command_with_warnings(mocker): text="", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_report_results_logic( commit_sha="commit_sha", @@ -67,7 +67,7 @@ def test_report_results_command_with_error(mocker): text="Permission denied", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_report_results_logic( commit_sha="commit_sha", diff --git a/tests/services/report/test_report_service.py b/tests/services/report/test_report_service.py index e302d00de..3476bbafc 100644 --- a/tests/services/report/test_report_service.py +++ b/tests/services/report/test_report_service.py @@ -73,7 +73,7 @@ def test_create_report_command_with_warnings(mocker): text="", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_report_logic( commit_sha="commit_sha", @@ -116,7 +116,7 @@ def test_create_report_command_with_error(mocker): warnings=[], ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = create_report_logic( commit_sha="commit_sha", diff --git a/tests/services/upload/test_upload_service.py b/tests/services/upload/test_upload_service.py index 6ce073696..8780c6002 100644 --- a/tests/services/upload/test_upload_service.py +++ b/tests/services/upload/test_upload_service.py @@ -42,7 +42,7 @@ def test_do_upload_logic_happy_path_legacy_uploader(mocker): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, @@ -159,7 +159,7 @@ def test_do_upload_logic_happy_path(mocker): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, @@ -270,7 +270,7 @@ def test_do_upload_logic_dry_run(mocker): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, @@ -356,7 +356,7 @@ def test_do_upload_logic_verbose(mocker, use_verbose_option): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, @@ -438,7 +438,7 @@ def side_effect(*args, **kwargs): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, @@ -634,7 +634,7 @@ def test_do_upload_logic_happy_path_test_results(mocker): versioning_system = mocker.MagicMock() ci_adapter = mocker.MagicMock() ci_adapter.get_fallback_value.return_value = "service" - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = do_upload_logic( cli_config, diff --git a/tests/services/upload_completion/test_upload_completion.py b/tests/services/upload_completion/test_upload_completion.py index ac69435fe..ba4b07c13 100644 --- a/tests/services/upload_completion/test_upload_completion.py +++ b/tests/services/upload_completion/test_upload_completion.py @@ -20,7 +20,7 @@ def test_upload_completion_with_warnings(mocker): text="", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = upload_completion_logic( "commit_sha", "owner/repo", uuid.uuid4(), "github", None @@ -49,7 +49,7 @@ def test_upload_completion_with_error(mocker): text="Permission denied", ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = upload_completion_logic( "commit_sha", "owner/repo", uuid.uuid4(), "github", None @@ -77,7 +77,7 @@ def test_upload_completion_200(mocker): ), ) token = uuid.uuid4() - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = upload_completion_logic( "commit_sha", "owner/repo", token, "github", None @@ -108,7 +108,7 @@ def test_upload_completion_no_token(mocker): status_code=200, error=None, warnings=[], text=json.dumps(res) ), ) - runner = CliRunner() + runner = CliRunner(mix_stderr=False) with runner.isolation() as outstreams: res = upload_completion_logic("commit_sha", "owner/repo", None, "github", None) out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue()) diff --git a/tests/test_fallbacks.py b/tests/test_fallbacks.py index b376e0510..e28834113 100644 --- a/tests/test_fallbacks.py +++ b/tests/test_fallbacks.py @@ -21,7 +21,7 @@ def hello_world(ctx, test): def test_branded_option(): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) result = runner.invoke(cli, ["hello-world"], env={"CODECOV_TEST": "hello_codecov"}) assert result.output == "hello_codecov\n" @@ -52,7 +52,7 @@ def with_name_fallback(name): def test_codecov_option_fallback_fields_uses_second_when_first_is_none(): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) adapter = MagicMock() def get_fallback(field): @@ -73,7 +73,7 @@ def get_fallback(field): def test_codecov_option_fallback_fields_prefers_first_when_set(): - runner = CliRunner() + runner = CliRunner(mix_stderr=False) adapter = MagicMock() def get_fallback(field):