--- a/tests/test-bundle2-exchange.t Sat Mar 24 14:08:50 2018 +0900
+++ b/tests/test-bundle2-exchange.t Sat Mar 24 14:09:44 2018 +0900
@@ -933,10 +933,10 @@
$ cat >> $TESTTMP/locktester.py <<EOF
> import os
- > from mercurial import extensions, bundle2, util
+ > from mercurial import extensions, bundle2, error
> def checklock(orig, repo, *args, **kwargs):
> if repo.svfs.lexists("lock"):
- > raise util.Abort("Lock should not be taken")
+ > raise error.Abort("Lock should not be taken")
> return orig(repo, *args, **kwargs)
> def extsetup(ui):
> extensions.wrapfunction(bundle2, 'processbundle', checklock)