Patchwork [3,of,5] test-bundle2-exchange: use error.Abort instead of util.Abort

login
register
mail settings
Submitter Yuya Nishihara
Date March 24, 2018, 9:53 a.m.
Message ID <9e694251731bf82895a6.1521885235@mimosa>
Download mbox | patch
Permalink /patch/29813/
State Accepted
Headers show

Comments

Yuya Nishihara - March 24, 2018, 9:53 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1521868184 -32400
#      Sat Mar 24 14:09:44 2018 +0900
# Node ID 9e694251731bf82895a6976ecba1afa3ece3fe2d
# Parent  f69531100039b5c81677be7c9f10c7598966a120
test-bundle2-exchange: use error.Abort instead of util.Abort

Patch

diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -933,10 +933,10 @@  Test lazily acquiring the lock during un
 
   $ 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)