Mercurial > python-hglib
changeset 88:3bbf6a3266f4
test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Fri, 18 Nov 2011 00:49:47 +0200 |
| parents | 5661d5f7e39b |
| children | 351d2799f145 |
| files | tests/test-summary.py |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-summary.py Thu Nov 17 12:54:37 2011 -0600 +++ b/tests/test-summary.py Fri Nov 18 00:49:47 2011 +0200 @@ -74,14 +74,21 @@ other.bookmark('bmother') d['remote'] = (1, 1, 0, 1) - d['parent'] = [(0, node[:12], 'tip bmother', 'first')] + if self.client.version < (2, 0, 0): + d['parent'] = [(0, node[:12], 'tip bmother', 'first')] + else: + d['bookmarks'] = '*bmother' self.assertEquals(other.summary(remote=True), d) self.append('other/a', 'a') rev, node = other.commit('second in other') d['remote'] = (1, 1, 1, 1) - d['parent'] = [(1, node[:12], 'tip bmother', 'second in other')] + if self.client.version < (2, 0, 0): + tags = 'tip bmother' + else: + tags = 'tip' + d['parent'] = [(1, node[:12], tags, 'second in other')] self.assertEquals(other.summary(remote=True), d)