diff -r d4a2e0d5d042 -r a8a902d7176e tests/mockblackbox.py
--- a/tests/mockblackbox.py	Sat Mar 24 15:09:33 2018 +0900
+++ b/tests/mockblackbox.py	Sat Mar 24 15:10:51 2018 +0900
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
-from mercurial import (
-    util,
+from mercurial.utils import (
+    procutil,
 )
 
 # XXX: we should probably offer a devel option to do this in blackbox directly
@@ -11,5 +11,5 @@
 
 # mock the date and user apis so the output is always the same
 def uisetup(ui):
-    util.getuser = getuser
-    util.getpid = getpid
+    procutil.getuser = getuser
+    procutil.getpid = getpid