--- a/tests/test-commit-multiple.t Thu Oct 18 21:55:47 2018 -0400
+++ b/tests/test-commit-multiple.t Wed Oct 17 23:33:43 2018 -0400
@@ -80,8 +80,8 @@
now test that we fixed the bug for all scripts/extensions
$ cat > $TESTTMP/committwice.py <<__EOF__
- > from mercurial import ui, hg, match, node
- > from time import sleep
+ > import time
+ > from mercurial import hg, match, node, ui as uimod
>
> def replacebyte(fn, b):
> f = open(fn, "rb+")
@@ -94,12 +94,12 @@
> % (rev, b', '.join(b"'%s'" % f
> for f in repo[rev].files())))
>
- > repo = hg.repository(ui.ui.load(), b'.')
+ > repo = hg.repository(uimod.ui.load(), b'.')
> assert len(repo) == 6, \
> "initial: len(repo): %d, expected: 6" % len(repo)
>
> replacebyte(b"bugfix", b"u")
- > sleep(2)
+ > time.sleep(2)
> try:
> repo.ui.status(b"PRE: len(repo): %d\n" % len(repo))
> wlock = repo.wlock()