diff -r 158b41842fd2 -r d9d8d78e6bc9 tests/dummysmtpd.py
--- a/tests/dummysmtpd.py	Wed Aug 17 20:41:05 2016 -0700
+++ b/tests/dummysmtpd.py	Sat Oct 15 13:47:43 2016 +0900
@@ -11,7 +11,7 @@
 import sys
 
 from mercurial import (
-    cmdutil,
+    server,
     sslutil,
     ui as uimod,
 )
@@ -75,8 +75,8 @@
             dummysmtpsecureserver(addr, opts.certificate)
         log('listening at %s:%d\n' % addr)
 
-    cmdutil.service(vars(opts), initfn=init, runfn=run,
-                    runargs=[sys.executable, __file__] + sys.argv[1:])
+    server.runservice(vars(opts), initfn=init, runfn=run,
+                      runargs=[sys.executable, __file__] + sys.argv[1:])
 
 if __name__ == '__main__':
     main()