--- a/hgserver/tests/test-push-basic.t
+++ b/hgserver/tests/test-push-basic.t
@@ -51,33 +51,33 @@ Pushing via ssh:// works
   remote: 
   remote: View your change here:
   remote:   https://hg.mozilla.org/mozilla-central/rev/77538e1ce4be
   remote: recorded changegroup in replication log in \d+\.\d+s (re)
 
 Blackbox logging recorded appropriate entries
 
   $ hgmo exec hgssh cat /repo/hg/mozilla/mozilla-central/.hg/blackbox.log
-  * user1@example.com (*)> serve --stdio (glob)
-  * user1@example.com (*)> pythonhook-pretxnopen: hgext_vcsreplicator.pretxnopenhook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-prechangegroup: hgext_readonly.prechangegrouphook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-pretxnchangegroup: mozhghooks.single_root.hook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-pretxnchangegroup: hgext_pushlog.pretxnchangegrouphook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-pretxnchangegroup: hgext_vcsreplicator.pretxnchangegrouphook finished in * seconds (glob)
-  * user1@example.com (*)> updated base branch cache in * seconds (glob)
-  * user1@example.com (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
-  * user1@example.com (*)> pythonhook-prepushkey: hgext_readonly.prepushkeyhook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-pretxnclose: hgext_vcsreplicator.pretxnclosehook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-pushkey: hgext_vcsreplicator.pushkeyhook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-txnclose: hgext_vcsreplicator.txnclosehook finished in * seconds (glob)
-  * user1@example.com (*)> exthook-changegroup.a_recordlogs: /var/hg/version-control-tools/scripts/record-pushes.sh finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-changegroup: mozhghooks.push_printurls.hook finished in * seconds (glob)
-  * user1@example.com (*)> pythonhook-changegroup: hgext_vcsreplicator.changegrouphook finished in * seconds (glob)
-  * user1@example.com (*)> 1 incoming changes - new heads: 77538e1ce4be (glob)
-  * user1@example.com (*)> -R /repo/hg/mozilla/mozilla-central serve --stdio exited 0 after * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnopen: hgext_vcsreplicator.pretxnopenhook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-prechangegroup: hgext_readonly.prechangegrouphook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnchangegroup: mozhghooks.single_root.hook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnchangegroup: hgext_pushlog.pretxnchangegrouphook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnchangegroup: hgext_vcsreplicator.pretxnchangegrouphook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> updated base branch cache in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-prepushkey: hgext_readonly.prepushkeyhook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pretxnclose: hgext_vcsreplicator.pretxnclosehook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-pushkey: hgext_vcsreplicator.pushkeyhook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-txnclose: hgext_vcsreplicator.txnclosehook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> exthook-changegroup.a_recordlogs: /var/hg/version-control-tools/scripts/record-pushes.sh finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: mozhghooks.push_printurls.hook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> pythonhook-changegroup: hgext_vcsreplicator.changegrouphook finished in * seconds (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 77538e1ce4be (glob)
+  * user1@example.com @0000000000000000000000000000000000000000 (*)> -R /repo/hg/mozilla/mozilla-central serve --stdio exited 0 after * seconds (glob)
 
 It got replicated to mirrors
 
   $ hgmo exec hgweb0 /var/hg/venv_replication/bin/vcsreplicator-consumer --wait-for-no-lag /etc/mercurial/vcsreplicator.ini
 
   $ http --no-headers ${HGWEB_0_URL}mozilla-central/json-rev/77538e1ce4be
   200