Skip to content

Commit

Permalink
fix: switch to assertEqual
Browse files Browse the repository at this point in the history
  • Loading branch information
alee committed Dec 12, 2024
1 parent 56cb518 commit c2408dc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion django/core/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def test_mark_spam(self):
)
event.refresh_from_db()
# non-moderators cannot mark content as spam
self.assertEquals(response.status_code, 403)
self.assertEqual(response.status_code, 403)
self.assertFalse(event.is_marked_spam)
# check moderator
self.client.login(
Expand Down
1 change: 0 additions & 1 deletion django/deploy/test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh

export DJANGO_SETTINGS_MODULE="core.settings.test"
printenv

chmod a+x /code/deploy/*.sh;

Expand Down
6 changes: 3 additions & 3 deletions django/home/tests/test_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ def test_convert_timeseries(self):
)
for chart_data in highcharts_timeseries:
# 2012 and 2013 should also be 0
self.assertEquals(
self.assertEqual(
tuple(chart_data["data"][0:2]),
(0, 0),
"2012-13 should be zeroed out",
)
# missing year 2016
self.assertEquals(
self.assertEqual(
chart_data["data"][4],
0,
f"5th entry (2016) should be 0 {chart_data['name']}",
)
self.assertTrue(
chart_data["name"] in OS_NAMES, f"Invalid OS name {chart_data['name']}"
)
self.assertEquals(len(chart_data["data"]), 7, "Should be 7 years of data")
self.assertEqual(len(chart_data["data"]), 7, "Should be 7 years of data")
2 changes: 1 addition & 1 deletion django/library/tests/test_datacite_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_mint_new_doi_for_release(self):
self.assertTrue(self.api.is_datacite_available())
release = self.codebase.releases.first()
log, ok = self.api.mint_public_doi(release)
self.assertEquals(log.http_status, 200, "should have successfully minted a DOI")
self.assertEqual(log.http_status, 200, "should have successfully minted a DOI")
self.assertTrue(self.api.doi_matches_pattern(doi))
def test_update_metadata_for_release(self):
Expand Down
8 changes: 4 additions & 4 deletions django/library/tests/test_fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def test_zipfile_saving(self):
fs_api=fs_api,
)
logs, level = msgs.serialize()
self.assertEquals(level, MessageLevels.warning)
self.assertEquals(len(logs), 2)
self.assertEqual(level, MessageLevels.warning)
self.assertEqual(len(logs), 2)
self.assertEqual(
set(
fs_api.list(StagingDirectories.originals, FileCategoryDirectories.code)
Expand Down Expand Up @@ -77,8 +77,8 @@ def test_invalid_zipfile_saving(self):
FileCategoryDirectories.code, content=f, name="invalid.zip"
)
logs, level = msgs.serialize()
self.assertEquals(level, MessageLevels.error)
self.assertEquals(len(logs), 1)
self.assertEqual(level, MessageLevels.error)
self.assertEqual(len(logs), 1)

@classmethod
def tearDownClass(cls):
Expand Down
8 changes: 4 additions & 4 deletions django/library/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ def setUp(self):
)

def test_base_dir(self):
self.assertEquals(
self.assertEqual(
self.c1.base_library_dir,
pathlib.Path(settings.LIBRARY_ROOT, str(self.c1.uuid)),
)
self.assertEquals(
self.assertEqual(
self.c1.base_git_dir,
pathlib.Path(settings.REPOSITORY_ROOT, str(self.c1.uuid)),
)
Expand All @@ -43,8 +43,8 @@ def test_create_release(self):
release = ReleaseSetup.setUpPublishableDraftRelease(self.c1)
release.validate_publishable()
release.publish()
self.assertEquals(self.c1.latest_version, release)
self.assertEquals(
self.assertEqual(self.c1.latest_version, release)
self.assertEqual(
CodebaseRelease.objects.get(
codebase=self.c1, version_number=release.version_number
),
Expand Down

0 comments on commit c2408dc

Please sign in to comment.