facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 14:28:17 +03:00
Code Issues Projects Releases Wiki Activity

make result regex less specific

Browse Source 
Reviewed By: genevievehelsel

Differential Revision: D51684630

fbshipit-source-id: dfc0679d7750b4e5ba405c51af202ab7d2bd66e9
This commit is contained in:
Michael Cuevas 2023-11-30 18:03:43 -08:00 committed by Facebook GitHub Bot
parent 3df43b7ff4
commit 1a82ef9ad5
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eden/integration/hg/graft_test.py
View File

@ -57,10 +57,7 @@ class GraftTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.hg("graft", commit2)
self.assertIn(
(
"warning: 1 conflicts while merging first.txt!"
" (edit, then use 'hg resolve --mark')\n"
),
"warning: 1 conflicts while merging first.txt!",
str(context.exception),
)
self.assertIn(

29
eden/integration/hg/rebase_test.py
View File

@ -173,8 +173,7 @@ class RebaseTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.hg("rebase", "-s", commit, "-d", self._c15)
self.assertIn(
b"conflicts while merging numbers/1/11! "
b"(edit, then use 'hg resolve --mark')",
b"conflicts while merging numbers/1/11!",
context.exception.stderr,
)
self.assert_unresolved(unresolved=["numbers/1/11", "numbers/1/12"])
@ -182,21 +181,21 @@ class RebaseTest(EdenHgTestCase):
self.assert_file_regex(
"numbers/1/11",
"""\
<<<<<<< dest.*
<<<<<<< .*
11
=======
new 11
>>>>>>> source.*
>>>>>>> .*
""",
)
self.assert_file_regex(
"numbers/1/12",
"""\
<<<<<<< dest.*
<<<<<<< .*
12
=======
new 12
>>>>>>> source.*
>>>>>>> .*
""",
)
@ -207,8 +206,7 @@ class RebaseTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.hg("rebase", "--continue")
self.assertIn(
b"conflicts while merging numbers/1/12! "
b"(edit, then use 'hg resolve --mark')",
b"conflicts while merging numbers/1/12!",
context.exception.stderr,
)
self.assert_unresolved(
@ -220,31 +218,31 @@ class RebaseTest(EdenHgTestCase):
self.assert_file_regex(
"numbers/1/12",
"""\
<<<<<<< dest.*
<<<<<<< .*
12 merged.
=======
change 12 again
>>>>>>> source.*
>>>>>>> .*
""",
)
self.assert_file_regex(
"numbers/1/13",
"""\
<<<<<<< dest.*
<<<<<<< .*
13
=======
new 13
>>>>>>> source.*
>>>>>>> .*
""",
)
self.assert_file_regex(
"numbers/1/14",
"""\
<<<<<<< dest.*
<<<<<<< .*
14
=======
new 14
>>>>>>> source.*
>>>>>>> .*
""",
)
@ -275,8 +273,7 @@ class RebaseTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.hg("rebase", "-s", commit, "-d", self._c15)
self.assertIn(
b"conflicts while merging numbers/1/11! "
b"(edit, then use 'hg resolve --mark')",
b"conflicts while merging numbers/1/11!",
context.exception.stderr,
)

14
eden/integration/hg/update_test.py
View File

@ -211,19 +211,18 @@ class UpdateTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.hg("update", ".^", "--merge")
self.assertIn(
b"1 conflicts while merging foo/bar.txt! "
b"(edit, then use 'hg resolve --mark')",
b"1 conflicts while merging foo/bar.txt!",
context.exception.stderr,
)
self.assert_status({"foo/bar.txt": "M"}, op="updatemerge")
self.assert_file_regex(
"foo/bar.txt",
"""\
<<<<<<< working copy.*
<<<<<<< .*
changing yet again
=======
test
>>>>>>> destination.*
>>>>>>> .*
""",
)
@ -373,8 +372,7 @@ class UpdateTest(EdenHgTestCase):
with self.assertRaises(hgrepo.HgError) as context:
self.repo.update(commit, merge=True)
self.assertIn(
b"warning: 1 conflicts while merging some_new_file.txt! "
b"(edit, then use 'hg resolve --mark')",
b"warning: 1 conflicts while merging some_new_file.txt!",
context.exception.stderr,
)
self.assertEqual(
@ -387,11 +385,11 @@ class UpdateTest(EdenHgTestCase):
self.assert_status({"some_new_file.txt": "M"}, op="updatemerge")
merge_contents = dedent(
"""\
<<<<<<< working copy.*
<<<<<<< .*
Re-create the file with different contents.
=======
Original contents.
>>>>>>> destination.*
>>>>>>> .*
"""
)
self.assertRegex(self.read_file("some_new_file.txt"), merge_contents)