diff --git a/swh/loader/core/tests/__init__.py b/swh/loader/core/tests/__init__.py --- a/swh/loader/core/tests/__init__.py +++ b/swh/loader/core/tests/__init__.py @@ -16,7 +16,7 @@ class BaseLoaderStorageTest: - def _assertCountOk(self, type, expected_length, msg=None): + def _assertCountEqual(self, type, expected_length, msg=None): """Check typed 'type' state to have the same expected length. """ @@ -25,46 +25,46 @@ expected_length, msg=msg) def assertCountContents(self, len_expected_contents, msg=None): - self._assertCountOk('content', len_expected_contents, msg=msg) + self._assertCountEqual('content', len_expected_contents, msg=msg) def assertCountDirectories(self, len_expected_directories, msg=None): - self._assertCountOk('directory', len_expected_directories, msg=msg) + self._assertCountEqual('directory', len_expected_directories, msg=msg) def assertCountReleases(self, len_expected_releases, msg=None): - self._assertCountOk('release', len_expected_releases, msg=msg) + self._assertCountEqual('release', len_expected_releases, msg=msg) def assertCountRevisions(self, len_expected_revisions, msg=None): - self._assertCountOk('revision', len_expected_revisions, msg=msg) + self._assertCountEqual('revision', len_expected_revisions, msg=msg) def assertCountSnapshots(self, len_expected_snapshot, msg=None): - self._assertCountOk('snapshot', len_expected_snapshot, msg=msg) + self._assertCountEqual('snapshot', len_expected_snapshot, msg=msg) - def assertContentsOk(self, expected_contents): - self._assertCountOk('content', len(expected_contents)) + def assertContentsEqual(self, expected_contents): + self._assertCountEqual('content', len(expected_contents)) missing = list(self.storage.content_missing( {'sha1': hash_to_bytes(content_hash)} for content_hash in expected_contents)) self.assertEqual(missing, []) - def assertDirectoriesOk(self, expected_directories): - self._assertCountOk('directory', len(expected_directories)) + def assertDirectoriesEqual(self, expected_directories): + self._assertCountEqual('directory', len(expected_directories)) missing = list(self.storage.directory_missing( dir_['id'] for dir_ in expected_directories)) self.assertEqual(missing, []) - def assertReleasesOk(self, expected_releases): + def assertReleasesEqual(self, expected_releases): """Check the loader's releases match the expected releases. Args: releases ([dict]): List of dictionaries representing swh releases. """ - self._assertCountOk('release', len(expected_releases)) + self._assertCountEqual('release', len(expected_releases)) missing = list(self.storage.releases_missing( rel['id'] for rel in expected_releases)) self.assertEqual(missing, []) - def assertRevisionsOk(self, expected_revisions): + def assertRevisionsEqual(self, expected_revisions): """Check the loader's revisions match the expected revisions. Expects self.loader to be instantiated and ready to be @@ -75,7 +75,7 @@ value the targeted directory id. """ - self._assertCountOk('revision', len(expected_revisions)) + self._assertCountEqual('revision', len(expected_revisions)) revs = list(self.storage.revision_get( hashutil.hash_to_bytes(rev_id) for rev_id in expected_revisions)) @@ -85,7 +85,7 @@ {hash_to_bytes(rev_id): hash_to_bytes(rev_dir) for (rev_id, rev_dir) in expected_revisions.items()}) - def assertSnapshotOk(self, expected_snapshot, expected_branches=[]): + def assertSnapshotEqual(self, expected_snapshot, expected_branches=[]): """Check for snapshot match. Provide the hashes as hexadecimal, the conversion is done @@ -106,7 +106,7 @@ else: expected_snapshot_id = expected_snapshot - self._assertCountOk('snapshot', 1) + self._assertCountEqual('snapshot', 1) snap = self.storage.snapshot_get(hash_to_bytes(expected_snapshot_id)) self.assertIsNotNone(snap) diff --git a/swh/loader/core/tests/test_loader.py b/swh/loader/core/tests/test_loader.py --- a/swh/loader/core/tests/test_loader.py +++ b/swh/loader/core/tests/test_loader.py @@ -122,7 +122,7 @@ """ self.storage.content_add(self.in_contents) self.assertCountContents(len(self.expected_contents)) - self.assertContentsOk(self.expected_contents) + self.assertContentsEqual(self.expected_contents) def test_failing(self): """Comparing wrong snapshot should fail. @@ -130,7 +130,7 @@ """ self.storage.content_add(self.in_contents) with self.assertRaises(AssertionError): - self.assertContentsOk([]) + self.assertContentsEqual([]) class LoadTestDirectory(DummyBaseLoaderTest): @@ -140,7 +140,7 @@ """ self.storage.directory_add(self.in_directories) self.assertCountDirectories(len(self.in_directories)) - self.assertDirectoriesOk(self.in_directories) + self.assertDirectoriesEqual(self.in_directories) def test_failing(self): """Comparing wrong snapshot should fail. @@ -148,4 +148,4 @@ """ self.storage.directory_add(self.in_directories) with self.assertRaises(AssertionError): - self.assertDirectoriesOk([]) + self.assertDirectoriesEqual([])