Mercurial > hgsubversion
diff tests/test_tags.py @ 376:9327e9325645
Use tbdelta to push added tags into .hgtags.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 29 May 2009 15:28:44 +0200 |
parents | af9fc01299b4 |
children | e1b23a6ca093 |
line wrap: on
line diff
--- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -13,21 +13,12 @@ class TestTags(test_util.TestBase): return test_util.load_fixture_and_fetch(fixture_name, self.repo_path, self.wc_path, stupid=stupid) - def _test_tag_revision_info(self, repo): - print repo.tags() - self.assertEqual(node.hex(repo[0].node()), - '434ed487136c1b47c1e8f952edb4dc5a8e6328df') - self.assertEqual(node.hex(repo['tip'].node()), - 'c95251e0dd04697deee99b79cc407d7db76e6a5f') - self.assertEqual(repo['tip'], repo[1]) - def test_tags(self, stupid=False): repo = self._load_fixture_and_fetch('basic_tag_tests.svndump', stupid=stupid) - self._test_tag_revision_info(repo) - repo = self.repo - self.assertEqual(repo['tip'].node(), repo['tag/tag_r3'].node()) - self.assertEqual(repo['tip'].node(), repo['tag/copied_tag'].node()) + self.assertEqual(sorted(repo.tags()), ['copied_tag', 'tag_r3', 'tip']) + self.assertEqual(repo['tag_r3'], repo['copied_tag']) + self.assertEqual(repo['tag_r3'].rev(), 1) def test_tags_stupid(self): self.test_tags(stupid=True) @@ -35,10 +26,8 @@ class TestTags(test_util.TestBase): def test_remove_tag(self, stupid=False): repo = self._load_fixture_and_fetch('remove_tag_test.svndump', stupid=stupid) - self._test_tag_revision_info(repo) - repo = self.repo - self.assertEqual(repo['tip'].node(), repo['tag/tag_r3'].node()) - self.assert_('tag/copied_tag' not in repo.tags()) + self.assertEqual(repo['tag_r3'].rev(), 1) + self.assert_('copied_tag' not in repo.tags()) def test_remove_tag_stupid(self): self.test_remove_tag(stupid=True) @@ -46,11 +35,8 @@ class TestTags(test_util.TestBase): def test_rename_tag(self, stupid=False): repo = self._load_fixture_and_fetch('rename_tag_test.svndump', stupid=stupid) - self._test_tag_revision_info(repo) - repo = self.repo - self.assertEqual(repo['tip'].node(), repo['tag/tag_r3'].node()) - self.assertEqual(repo['tip'].node(), repo['tag/other_tag_r3'].node()) - self.assert_('tag/copied_tag' not in repo.tags()) + self.assertEqual(repo['tag_r3'], repo['other_tag_r3']) + self.assert_('copied_tag' not in repo.tags()) def test_rename_tag_stupid(self): self.test_rename_tag(stupid=True) @@ -58,11 +44,9 @@ class TestTags(test_util.TestBase): def test_branch_from_tag(self, stupid=False): repo = self._load_fixture_and_fetch('branch_from_tag.svndump', stupid=stupid) - repo = self.repo - self.assertEqual(repo['tip'].node(), repo['branch_from_tag'].node()) - self.assertEqual(repo[1].node(), repo['tag/tag_r3'].node()) - self.assertEqual(repo['branch_from_tag'].parents()[0].node(), - repo['tag/copied_tag'].node()) + self.assert_('branch_from_tag' in repo.branchtags()) + self.assertEqual(repo[1], repo['tag_r3']) + self.assertEqual(repo['branch_from_tag'].parents()[0], repo['copied_tag']) def test_branch_from_tag_stupid(self): self.test_branch_from_tag(stupid=True) @@ -70,15 +54,9 @@ class TestTags(test_util.TestBase): def test_tag_by_renaming_branch(self, stupid=False): repo = self._load_fixture_and_fetch('tag_by_rename_branch.svndump', stupid=stupid) - repo = self.repo - branches = set() - for h in repo.heads(): - ctx = repo[h] - if 'close' not in ctx.extra(): - branches.add(ctx.branch()) - + branches = set(repo[h] for h in repo.heads(closed=False)) self.assert_('dummy' not in branches) - self.assertEqual(repo['tag/dummy'], repo['tip'].parents()[0]) + self.assertEqual(repo['dummy'], repo['tip'].parents()[0].parents()[0]) extra = repo['tip'].extra().copy() extra.pop('convert_revision', None) self.assertEqual(extra, {'branch': 'dummy', 'close': '1'})