Skip to content

Commit d32789f

Browse files
committed
Fix unit tests.
1 parent 23deb22 commit d32789f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

tests/unit/test_charm.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_start_maintenance_status_when_starting():
2121
with (
2222
patch("managers.config.ConfigManager.render_env"),
2323
patch("workload.CassandraWorkload.restart"),
24-
patch("workload.CassandraWorkload.alive"),
24+
patch("workload.CassandraWorkload.is_alive"),
2525
patch(
2626
"managers.cluster.ClusterManager.is_healthy",
2727
new_callable=PropertyMock(return_value=False),
@@ -42,7 +42,7 @@ def test_start_sets_active_status_when_healthy():
4242
with (
4343
patch("managers.config.ConfigManager.render_env"),
4444
patch("workload.CassandraWorkload.restart"),
45-
patch("workload.CassandraWorkload.alive"),
45+
patch("workload.CassandraWorkload.is_alive"),
4646
patch(
4747
"managers.cluster.ClusterManager.is_healthy",
4848
new_callable=PropertyMock(return_value=True),
@@ -63,7 +63,7 @@ def test_start_only_after_leader_active():
6363
with (
6464
patch("managers.config.ConfigManager.render_env"),
6565
patch("workload.CassandraWorkload.restart") as restart,
66-
patch("workload.CassandraWorkload.alive"),
66+
patch("workload.CassandraWorkload.is_alive"),
6767
patch(
6868
"managers.cluster.ClusterManager.is_healthy",
6969
new_callable=PropertyMock(return_value=False),
@@ -81,7 +81,7 @@ def test_start_only_after_leader_active():
8181
with (
8282
patch("managers.config.ConfigManager.render_env"),
8383
patch("workload.CassandraWorkload.restart") as restart,
84-
patch("workload.CassandraWorkload.alive"),
84+
patch("workload.CassandraWorkload.is_alive"),
8585
patch(
8686
"managers.cluster.ClusterManager.is_healthy",
8787
new_callable=PropertyMock(return_value=False),
@@ -101,7 +101,7 @@ def test_config_changed_invalid_config():
101101
with (
102102
patch("managers.config.ConfigManager.render_env"),
103103
patch("workload.CassandraWorkload.restart"),
104-
patch("workload.CassandraWorkload.alive"),
104+
patch("workload.CassandraWorkload.is_alive"),
105105
patch(
106106
"managers.cluster.ClusterManager.is_healthy",
107107
new_callable=PropertyMock(return_value=False),
@@ -121,7 +121,7 @@ def test_config_changed_no_restart():
121121
with (
122122
patch("managers.config.ConfigManager.render_env"),
123123
patch("workload.CassandraWorkload.restart") as restart,
124-
patch("workload.CassandraWorkload.alive"),
124+
patch("workload.CassandraWorkload.is_alive"),
125125
patch(
126126
"managers.cluster.ClusterManager.is_healthy",
127127
new_callable=PropertyMock(return_value=False),
@@ -144,7 +144,7 @@ def test_collect_unit_status_active_but_not_healthy():
144144
with (
145145
patch("managers.config.ConfigManager.render_env"),
146146
patch("workload.CassandraWorkload.restart"),
147-
patch("workload.CassandraWorkload.alive"),
147+
patch("workload.CassandraWorkload.is_alive"),
148148
patch(
149149
"managers.cluster.ClusterManager.is_healthy",
150150
new_callable=PropertyMock(return_value=False),
@@ -164,7 +164,7 @@ def test_start_not_leader_and_cluster_state_not_active():
164164
with (
165165
patch("managers.config.ConfigManager.render_env"),
166166
patch("workload.CassandraWorkload.restart") as restart,
167-
patch("workload.CassandraWorkload.alive"),
167+
patch("workload.CassandraWorkload.is_alive"),
168168
patch(
169169
"managers.cluster.ClusterManager.is_healthy",
170170
new_callable=PropertyMock(return_value=False),

tests/unit/test_workload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def mock_snap_cache():
1818

1919
def test_alive_true_if_service_active(mock_snap_cache):
2020
workload = CassandraWorkload()
21-
assert workload.alive() is True
21+
assert workload.is_alive() is True
2222

2323

2424
def test_alive_false_if_service_missing(mock_snap_cache):
2525
mock_snap_cache.services = {} # simulate service not found
2626
workload = CassandraWorkload()
27-
assert workload.alive() is False
27+
assert workload.is_alive() is False
2828

2929

3030
def test_exec_successful_command_returns_output():

0 commit comments

Comments
 (0)