Set a default value to status parameter of my_mock in tests

Most of the times, it's 200, so the default value simplifies usage in
actual tests.
This commit is contained in:
Denis Laxalde 2023-09-28 09:56:08 +02:00
parent 123c300911
commit c3cdb8cdd4
15 changed files with 96 additions and 57 deletions

View file

@ -11,7 +11,7 @@ def test_api_status_code_200(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_pending_restart_ok", 200)
my_mock(mocker, "node_is_pending_restart_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_pending_restart"]
)
@ -23,7 +23,7 @@ def test_api_status_code_404(
) -> None:
runner = CliRunner()
my_mock(mocker, "Fake test", 404)
my_mock(mocker, "Fake test", status=404)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_pending_restart"]
)

View file

@ -12,7 +12,7 @@ def test_cluster_config_has_changed_ok_with_hash(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_config_has_changed", 200)
my_mock(mocker, "cluster_config_has_changed")
result = runner.invoke(
main,
[
@ -38,7 +38,7 @@ def test_cluster_config_has_changed_ok_with_state_file(
with open(here / "cluster_config_has_changed.state_file", "w") as f:
f.write('{"hash": "96b12d82571473d13e890b893734e731"}')
my_mock(mocker, "cluster_config_has_changed", 200)
my_mock(mocker, "cluster_config_has_changed")
result = runner.invoke(
main,
[
@ -61,7 +61,7 @@ def test_cluster_config_has_changed_ko_with_hash(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_config_has_changed", 200)
my_mock(mocker, "cluster_config_has_changed")
result = runner.invoke(
main,
[
@ -88,7 +88,7 @@ def test_cluster_config_has_changed_ko_with_state_file_and_save(
with open(here / "cluster_config_has_changed.state_file", "w") as f:
f.write('{"hash": "96b12d82571473d13e890b8937ffffff"}')
my_mock(mocker, "cluster_config_has_changed", 200)
my_mock(mocker, "cluster_config_has_changed")
# test without saving the new hash
result = runner.invoke(
main,
@ -145,7 +145,7 @@ def test_cluster_config_has_changed_params(
# This one is placed last because it seems like the exceptions are not flushed from stderr for the next tests.
runner = CliRunner()
my_mock(mocker, "cluster_config_has_changed", 200)
my_mock(mocker, "cluster_config_has_changed")
result = runner.invoke(
main,
[

View file

@ -11,7 +11,7 @@ def test_cluster_has_leader_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_leader_ok", 200)
my_mock(mocker, "cluster_has_leader_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_leader"]
)
@ -27,7 +27,7 @@ def test_cluster_has_leader_ok_standby_leader(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_leader_ok_standby_leader", 200)
my_mock(mocker, "cluster_has_leader_ok_standby_leader")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_leader"]
)
@ -43,7 +43,7 @@ def test_cluster_has_leader_ko(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_leader_ko", 200)
my_mock(mocker, "cluster_has_leader_ko")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_leader"]
)

View file

@ -12,7 +12,9 @@ def test_cluster_has_relica_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ok", 200, use_old_replica_state)
my_mock(
mocker, "cluster_has_replica_ok", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_replica"]
)
@ -28,7 +30,9 @@ def test_cluster_has_replica_ok_with_count_thresholds(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ok", 200, use_old_replica_state)
my_mock(
mocker, "cluster_has_replica_ok", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main,
[
@ -53,7 +57,9 @@ def test_cluster_has_replica_ok_with_sync_count_thresholds(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ok", 200, use_old_replica_state)
my_mock(
mocker, "cluster_has_replica_ok", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main,
[
@ -77,7 +83,11 @@ def test_cluster_has_replica_ok_with_count_thresholds_lag(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ok_lag", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_has_replica_ok_lag",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[
@ -104,7 +114,9 @@ def test_cluster_has_replica_ko_with_count_thresholds(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ko", 200, use_old_replica_state)
my_mock(
mocker, "cluster_has_replica_ko", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main,
[
@ -129,7 +141,9 @@ def test_cluster_has_replica_ko_with_sync_count_thresholds(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ko", 200, use_old_replica_state)
my_mock(
mocker, "cluster_has_replica_ko", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main,
[
@ -155,7 +169,11 @@ def test_cluster_has_replica_ko_with_count_thresholds_and_lag(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_replica_ko_lag", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_has_replica_ko_lag",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[

View file

@ -11,7 +11,7 @@ def test_cluster_has_scheduled_action_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_scheduled_action_ok", 200)
my_mock(mocker, "cluster_has_scheduled_action_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_scheduled_action"]
)
@ -27,7 +27,7 @@ def test_cluster_has_scheduled_action_ko_switchover(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_scheduled_action_ko_switchover", 200)
my_mock(mocker, "cluster_has_scheduled_action_ko_switchover")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_scheduled_action"]
)
@ -43,7 +43,7 @@ def test_cluster_has_scheduled_action_ko_restart(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_has_scheduled_action_ko_restart", 200)
my_mock(mocker, "cluster_has_scheduled_action_ko_restart")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_has_scheduled_action"]
)

View file

@ -11,7 +11,7 @@ def test_cluster_is_in_maintenance_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_is_in_maintenance_ok", 200)
my_mock(mocker, "cluster_is_in_maintenance_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_is_in_maintenance"]
)
@ -27,7 +27,7 @@ def test_cluster_is_in_maintenance_ko(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_is_in_maintenance_ko", 200)
my_mock(mocker, "cluster_is_in_maintenance_ko")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_is_in_maintenance"]
)
@ -43,7 +43,7 @@ def test_cluster_is_in_maintenance_ok_pause_false(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_is_in_maintenance_ok_pause_false", 200)
my_mock(mocker, "cluster_is_in_maintenance_ok_pause_false")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_is_in_maintenance"]
)

View file

@ -11,7 +11,9 @@ def test_cluster_node_count_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_ok", 200, use_old_replica_state)
my_mock(
mocker, "cluster_node_count_ok", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "cluster_node_count"]
)
@ -33,7 +35,9 @@ def test_cluster_node_count_ok_with_thresholds(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_ok", 200, use_old_replica_state)
my_mock(
mocker, "cluster_node_count_ok", use_old_replica_state=use_old_replica_state
)
result = runner.invoke(
main,
[
@ -68,7 +72,11 @@ def test_cluster_node_count_healthy_warning(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_healthy_warning", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_node_count_healthy_warning",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[
@ -99,7 +107,11 @@ def test_cluster_node_count_healthy_critical(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_healthy_critical", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_node_count_healthy_critical",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[
@ -124,7 +136,11 @@ def test_cluster_node_count_warning(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_warning", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_node_count_warning",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[
@ -155,7 +171,11 @@ def test_cluster_node_count_critical(
) -> None:
runner = CliRunner()
my_mock(mocker, "cluster_node_count_critical", 200, use_old_replica_state)
my_mock(
mocker,
"cluster_node_count_critical",
use_old_replica_state=use_old_replica_state,
)
result = runner.invoke(
main,
[

View file

@ -9,7 +9,7 @@ from .tools import my_mock
def test_node_is_alive_ok(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, None, 200)
my_mock(mocker, None)
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_alive"])
assert result.exit_code == 0
assert (
@ -21,7 +21,7 @@ def test_node_is_alive_ok(mocker: MockerFixture, use_old_replica_state: bool) ->
def test_node_is_alive_ko(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, None, 404)
my_mock(mocker, None, status=404)
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_alive"])
assert result.exit_code == 2
assert (

View file

@ -9,7 +9,7 @@ from .tools import my_mock
def test_node_is_leader_ok(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_leader_ok", 200)
my_mock(mocker, "node_is_leader_ok")
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_leader"])
assert result.exit_code == 0
assert (
@ -17,7 +17,7 @@ def test_node_is_leader_ok(mocker: MockerFixture, use_old_replica_state: bool) -
== "NODEISLEADER OK - This node is a leader node. | is_leader=1;;@0\n"
)
my_mock(mocker, "node_is_leader_ok_standby_leader", 200)
my_mock(mocker, "node_is_leader_ok_standby_leader")
result = runner.invoke(
main,
["-e", "https://10.20.199.3:8008", "node_is_leader", "--is-standby-leader"],
@ -33,7 +33,7 @@ def test_node_is_leader_ok(mocker: MockerFixture, use_old_replica_state: bool) -
def test_node_is_leader_ko(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_leader_ko", 503)
my_mock(mocker, "node_is_leader_ko", status=503)
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_leader"])
assert result.exit_code == 2
assert (
@ -41,7 +41,7 @@ def test_node_is_leader_ko(mocker: MockerFixture, use_old_replica_state: bool) -
== "NODEISLEADER CRITICAL - This node is not a leader node. | is_leader=0;;@0\n"
)
my_mock(mocker, "node_is_leader_ko_standby_leader", 503)
my_mock(mocker, "node_is_leader_ko_standby_leader", status=503)
result = runner.invoke(
main,
["-e", "https://10.20.199.3:8008", "node_is_leader", "--is-standby-leader"],

View file

@ -11,7 +11,7 @@ def test_node_is_pending_restart_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_pending_restart_ok", 200)
my_mock(mocker, "node_is_pending_restart_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_pending_restart"]
)
@ -27,7 +27,7 @@ def test_node_is_pending_restart_ko(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_pending_restart_ko", 200)
my_mock(mocker, "node_is_pending_restart_ko")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_pending_restart"]
)

View file

@ -9,7 +9,7 @@ from .tools import my_mock
def test_node_is_primary_ok(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_primary_ok", 200)
my_mock(mocker, "node_is_primary_ok")
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_primary"])
assert result.exit_code == 0
assert (
@ -21,7 +21,7 @@ def test_node_is_primary_ok(mocker: MockerFixture, use_old_replica_state: bool)
def test_node_is_primary_ko(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_primary_ko", 503)
my_mock(mocker, "node_is_primary_ko", status=503)
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_primary"])
assert result.exit_code == 2
assert (

View file

@ -9,7 +9,7 @@ from .tools import my_mock
def test_node_is_replica_ok(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_replica_ok", 200)
my_mock(mocker, "node_is_replica_ok")
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_replica"])
assert result.exit_code == 0
assert (
@ -21,7 +21,7 @@ def test_node_is_replica_ok(mocker: MockerFixture, use_old_replica_state: bool)
def test_node_is_replica_ko(mocker: MockerFixture, use_old_replica_state: bool) -> None:
runner = CliRunner()
my_mock(mocker, "node_is_replica_ko", 503)
my_mock(mocker, "node_is_replica_ko", status=503)
result = runner.invoke(main, ["-e", "https://10.20.199.3:8008", "node_is_replica"])
assert result.exit_code == 2
assert (
@ -36,7 +36,7 @@ def test_node_is_replica_ko_lag(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 503)
my_mock(mocker, "node_is_replica_ok", status=503)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_replica", "--max-lag", "100"]
)
@ -46,7 +46,7 @@ def test_node_is_replica_ko_lag(
== "NODEISREPLICA CRITICAL - This node is not a running replica with no noloadbalance tag and a lag under 100. | is_replica=0;;@0\n"
)
my_mock(mocker, "node_is_replica_ok", 503)
my_mock(mocker, "node_is_replica_ok", status=503)
result = runner.invoke(
main,
[
@ -71,7 +71,7 @@ def test_node_is_replica_sync_ok(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 200)
my_mock(mocker, "node_is_replica_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_replica", "--is-sync"]
)
@ -88,7 +88,7 @@ def test_node_is_replica_sync_ko(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 503)
my_mock(mocker, "node_is_replica_ok", status=503)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_replica", "--is-sync"]
)
@ -105,7 +105,7 @@ def test_node_is_replica_async_ok(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 200)
my_mock(mocker, "node_is_replica_ok")
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_replica", "--is-async"]
)
@ -122,7 +122,7 @@ def test_node_is_replica_async_ko(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 503)
my_mock(mocker, "node_is_replica_ok", status=503)
result = runner.invoke(
main, ["-e", "https://10.20.199.3:8008", "node_is_replica", "--is-async"]
)
@ -139,7 +139,7 @@ def test_node_is_replica_params(
runner = CliRunner()
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 200)
my_mock(mocker, "node_is_replica_ok")
result = runner.invoke(
main,
[
@ -157,7 +157,7 @@ def test_node_is_replica_params(
)
# We don't do the check ourselves, patroni does it and changes the return code
my_mock(mocker, "node_is_replica_ok", 200)
my_mock(mocker, "node_is_replica_ok")
result = runner.invoke(
main,
[

View file

@ -11,7 +11,7 @@ def test_node_patroni_version_ok(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_patroni_version", 200)
my_mock(mocker, "node_patroni_version")
result = runner.invoke(
main,
[
@ -34,7 +34,7 @@ def test_node_patroni_version_ko(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_patroni_version", 200)
my_mock(mocker, "node_patroni_version")
result = runner.invoke(
main,
[

View file

@ -12,7 +12,7 @@ def test_node_tl_has_changed_ok_with_timeline(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_tl_has_changed", 200)
my_mock(mocker, "node_tl_has_changed")
result = runner.invoke(
main,
[
@ -38,7 +38,7 @@ def test_node_tl_has_changed_ok_with_state_file(
with open(here / "node_tl_has_changed.state_file", "w") as f:
f.write('{"timeline": 58}')
my_mock(mocker, "node_tl_has_changed", 200)
my_mock(mocker, "node_tl_has_changed")
result = runner.invoke(
main,
[
@ -61,7 +61,7 @@ def test_node_tl_has_changed_ko_with_timeline(
) -> None:
runner = CliRunner()
my_mock(mocker, "node_tl_has_changed", 200)
my_mock(mocker, "node_tl_has_changed")
result = runner.invoke(
main,
[
@ -87,7 +87,7 @@ def test_node_tl_has_changed_ko_with_state_file_and_save(
with open(here / "node_tl_has_changed.state_file", "w") as f:
f.write('{"timeline": 700}')
my_mock(mocker, "node_tl_has_changed", 200)
my_mock(mocker, "node_tl_has_changed")
# test without saving the new tl
result = runner.invoke(
main,
@ -144,7 +144,7 @@ def test_node_tl_has_changed_params(
# This one is placed last because it seems like the exceptions are not flushed from stderr for the next tests.
runner = CliRunner()
my_mock(mocker, "node_tl_has_changed", 200)
my_mock(mocker, "node_tl_has_changed")
result = runner.invoke(
main,
[

View file

@ -21,7 +21,8 @@ def getjson(name: str) -> Any:
def my_mock(
mocker: MockerFixture,
json_file: str,
status: int,
*,
status: int = 200,
use_old_replica_state: bool = False,
) -> None:
def mock_rest_api(self: PatroniResource, service: str) -> Any: