Mercurial > hgsubversion

diff tests/test_fetch_mappings.py @ 1588:e2d38f6b8afe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make output comaptible with hash changes in hg-4.8 46da52f4b820 in core mercurial added logic to try hard to reuse manifest if we can. In the tests of hgsubversion, there are lot of cases we create an empty commit with just branch name changed. In hg < 4.8, hgsubversion used to create a new manifest entry for that commit but after that patch, empty commit started using the manifest of the parent leading to hash change.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 31 Oct 2018 17:04:57 +0300
parents d55c9d0ba350
children
line wrap: on
line diff
--- a/tests/test_fetch_mappings.py
+++ b/tests/test_fetch_mappings.py
@@ -147,14 +147,18 @@ class MapTests(test_util.TestBase):
         repo = self._loadwithfilemap('replace_trunk_with_branch.svndump',
             "include alpha\n")
         self.assertEqual(node.hex(repo[0].node()), '88e2c7492d83e4bf30fbb2dcbf6aa24d60ac688d')
-        self.assertEqual(node.hex(revsymbol(repo, 'default').node()), 'e524296152246b3837fe9503c83b727075835155')
+        self.assertTrue(node.hex(revsymbol(repo, 'default').node()) in
+                        ('e524296152246b3837fe9503c83b727075835155',
+                         'ecf9b521a1799ebb0e01c1d1e86305ea8b542d2e'))
 
     @test_util.requiresreplay
     def test_file_map_exclude(self):
         repo = self._loadwithfilemap('replace_trunk_with_branch.svndump',
             "exclude alpha\n")
         self.assertEqual(node.hex(repo[0].node()), '2c48f3525926ab6c8b8424bcf5eb34b149b61841')
-        self.assertEqual(node.hex(revsymbol(repo, 'default').node()), 'b37a3c0297b71f989064d9b545b5a478bbed7cc1')
+        self.assertTrue(node.hex(revsymbol(repo, 'default').node()) in
+                        ('b37a3c0297b71f989064d9b545b5a478bbed7cc1',
+                         'e494691507b55deeb85c9c362d47b427f5c644ad'))
 
     @test_util.requiresreplay
     def test_file_map_rule_order(self):