Skip to content

Commit 25d56be

Browse files
bdrungrndmh3ro
authored andcommitted
test: replace deprecated TestCase.assertEquals
`TestCase.assertEquals` is depracated and removed in Python 3.12. Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
1 parent 6773070 commit 25d56be

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- "test: replace deprecated `TestCase.assertEquals` to support Python 3.12"

tests/unit/modules/grafana/grafana_team/test_grafana_team.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def test_get_team_method_with_existing_team(self, mock_fetch_url, mock_get_versi
306306
},
307307
method="GET",
308308
)
309-
self.assertEquals(res, {"email": "email@test.com", "name": "MyTestTeam"})
309+
self.assertEqual(res, {"email": "email@test.com", "name": "MyTestTeam"})
310310

311311
@patch(
312312
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -341,7 +341,7 @@ def test_get_team_method_with_non_existing_team(
341341
},
342342
method="GET",
343343
)
344-
self.assertEquals(res, None)
344+
self.assertEqual(res, None)
345345

346346
@patch(
347347
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -377,7 +377,7 @@ def test_create_team_method(self, mock_fetch_url, mock_get_version):
377377
},
378378
method="POST",
379379
)
380-
self.assertEquals(res, {"message": "Team created", "teamId": 2})
380+
self.assertEqual(res, {"message": "Team created", "teamId": 2})
381381

382382
@patch(
383383
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -412,7 +412,7 @@ def test_update_team_method(self, mock_fetch_url, mock_get_version):
412412
},
413413
method="PUT",
414414
)
415-
self.assertEquals(res, {"message": "Team updated"})
415+
self.assertEqual(res, {"message": "Team updated"})
416416

417417
@patch(
418418
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -445,7 +445,7 @@ def test_delete_team_method(self, mock_fetch_url, mock_get_version):
445445
},
446446
method="DELETE",
447447
)
448-
self.assertEquals(res, {"message": "Team deleted"})
448+
self.assertEqual(res, {"message": "Team deleted"})
449449

450450
@patch(
451451
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -478,7 +478,7 @@ def test_get_team_members_method(self, mock_fetch_url, mock_get_version):
478478
},
479479
method="GET",
480480
)
481-
self.assertEquals(res, ["user1@email.com", "user2@email.com"])
481+
self.assertEqual(res, ["user1@email.com", "user2@email.com"])
482482

483483
@patch(
484484
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -513,7 +513,7 @@ def test_get_team_members_method_no_members_returned(
513513
},
514514
method="GET",
515515
)
516-
self.assertEquals(res, [])
516+
self.assertEqual(res, [])
517517

518518
@patch(
519519
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -550,7 +550,7 @@ def test_add_team_member_method(self, mock_fetch_url, mock_get_version):
550550
},
551551
method="POST",
552552
)
553-
self.assertEquals(res, None)
553+
self.assertEqual(res, None)
554554

555555
@patch(
556556
"ansible_collections.community.grafana.plugins.modules.grafana_team.GrafanaTeamInterface.get_version"
@@ -587,13 +587,13 @@ def test_delete_team_member_method(self, mock_fetch_url, mock_get_version):
587587
},
588588
method="DELETE",
589589
)
590-
self.assertEquals(res, None)
590+
self.assertEqual(res, None)
591591

592592
def test_diff_members_function(self):
593593
list1 = ["foo@example.com", "bar@example.com"]
594594
list2 = ["bar@example.com", "random@example.com"]
595595

596596
res = grafana_team.diff_members(list1, list2)
597-
self.assertEquals(
597+
self.assertEqual(
598598
res, {"to_del": ["random@example.com"], "to_add": ["foo@example.com"]}
599599
)

tests/unit/modules/grafana/grafana_user/test_grafana_user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def test_create_user_new_user(self, mock_fetch_url):
191191

192192
mock_fetch_url.assert_has_calls(expected_fetch_url_calls, any_order=False)
193193

194-
self.assertEquals(
194+
self.assertEqual(
195195
result,
196196
{
197197
"id": 2,
@@ -238,4 +238,4 @@ def test_delete_user(self, mock_fetch_url):
238238
},
239239
method="DELETE",
240240
)
241-
self.assertEquals(result, {"message": "User deleted"})
241+
self.assertEqual(result, {"message": "User deleted"})

0 commit comments

Comments
 (0)