tests/test-flagprocessor.t
changeset 31834 433ab46f6bb4
parent 31833 723c1ab2f77e
child 31835 4bafc80f827e
--- a/tests/test-flagprocessor.t	Thu Apr 06 17:24:36 2017 -0700
+++ b/tests/test-flagprocessor.t	Thu Apr 06 17:43:29 2017 -0700
@@ -188,11 +188,10 @@
   4 changesets found
   $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
   $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*|  )'
-  Traceback (most recent call last):
-  mercurial.mpatch.mpatchError: invalid patch
+  abort: integrity check failed on data/base64.i:2!
 
   $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*|  )'
   Traceback (most recent call last):
-  TypeError: Incorrect padding
+  mercurial.mpatch.mpatchError: invalid patch
   $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*|  )'
   abort: repository bundle-again.hg not found!