diff --git a/swh/loader/svn/tests/test_loader.py b/swh/loader/svn/tests/test_loader.py --- a/swh/loader/svn/tests/test_loader.py +++ b/swh/loader/svn/tests/test_loader.py @@ -183,8 +183,7 @@ """ # when - self.loader.load() - + assert self.loader.load() == {"status": "eventful"} # then self.assertCountRevisions(6) self.assertCountReleases(0) @@ -204,7 +203,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -245,7 +243,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "uneventful"} # then @@ -254,7 +252,6 @@ self.assertCountRevisions(0) self.assertCountReleases(0) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "uneventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) self.assertEqual(visit["snapshot"], GOURMET_FLAG_SNAPSHOT) @@ -287,7 +284,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "failed"} # then # we got the previous run's last revision (rev 6) @@ -297,7 +294,6 @@ self.assertCountRevisions(0) self.assertCountReleases(0) self.assertCountSnapshots(0) - self.assertEqual(self.loader.load_status(), {"status": "uneventful"}) self.assertEqual(self.loader.visit_status(), "partial") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -323,7 +319,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then # we got the previous run's last revision (rev 6) @@ -346,7 +342,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -375,7 +370,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then # we got the previous run's last revision (rev 6) @@ -401,7 +396,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -451,7 +445,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then # we got the previous run's last revision (rev 6) @@ -473,7 +467,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -518,7 +511,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then # we got the previous run's last revision (rev 6) @@ -540,7 +533,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -606,7 +598,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then # we got the previous run's last revision (rev 6) @@ -628,7 +620,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -655,14 +646,13 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} expected_revisions = { "7da4975c363101b819756d33459f30a866d01b1b": "f63637223ee0f7d4951ffd2d4d9547a4882c5d8b" # noqa } self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -689,7 +679,7 @@ """Load repo with mixed CRLF/LF endings (svn:eol-style:native) is ok """ - self.loader.load() + assert self.loader.load() == {"status": "eventful"} expected_revisions = { "9c6962eeb9164a636c374be700672355e34a98a7": "16aa6b6271f3456d4643999d234cf39fe3d0cc5a" # noqa @@ -697,7 +687,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -726,7 +715,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then repositories holds 21 revisions, but the last commit # one holds an 'svn:externals' property which will make the @@ -762,7 +751,6 @@ # The last revision being the one used later to start back from self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "partial") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -791,7 +779,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then repositories holds 14 revisions, but the last commit self.assertCountRevisions(19) @@ -823,7 +811,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -846,7 +833,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} # then repositories holds 14 revisions, but the last commit self.assertCountRevisions(21) @@ -881,7 +868,6 @@ self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url) @@ -944,7 +930,7 @@ """ # when - self.loader.load() + assert self.loader.load() == {"status": "eventful"} self.assertCountRevisions(7, "7 svn commits") self.assertCountReleases(0) @@ -970,7 +956,6 @@ self.assertSnapshotEqual(expected_snapshot_id, expected_branches) - self.assertEqual(self.loader.load_status(), {"status": "eventful"}) self.assertEqual(self.loader.visit_status(), "full") visit = self.storage.origin_visit_get_latest(self.repo_url)