1485880 - Make serverlog compatible with Mercurial 4.7

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Connor Sheehan [:sheehan]]

Logs from test failures:

--- /home/connor/version-control-tools/hgext/serverlog/tests/test-ssh-syslog.t
+++ /home/connor/version-control-tools/hgext/serverlog/tests/test-ssh-syslog.t.err
@@ -20,11 +20,12 @@
   * hgweb: *:* END_SSH_COMMAND * * (glob)
   * hgweb: *:* BEGIN_SSH_COMMAND between (glob)
   * hgweb: *:* END_SSH_COMMAND * * (glob)
+  2018-08-24T05:00:36.468742+00:00 e4ec8d494824 hgweb: a35e72d6-a75a-11e8-b93b-0242ac120004: BEGIN_SSH_COMMAND protocaps
+  * hgweb: *:* END_SSH_COMMAND * * (glob)
   * hgweb: *:* BEGIN_SSH_COMMAND batch (glob)
   * hgweb: *:* END_SSH_COMMAND * * (glob)
   * hgweb: *:* BEGIN_SSH_COMMAND getbundle (glob)
   * hgweb: *:* END_SSH_COMMAND * * (glob)
-  * hgweb: *:* END_SSH_COMMAND * * (glob)
   * hgweb: *: END_SSH_SESSION * * (glob)
 
   $ hgmo clean

ERROR: test-ssh-syslog.t output changed
!
--- /home/connor/version-control-tools/hgext/serverlog/tests/test-http-syslog.t
+++ /home/connor/version-control-tools/hgext/serverlog/tests/test-http-syslog.t.err
@@ -20,18 +20,18 @@
   $ http --no-headers ${HGWEB_0_URL}mozilla-central/json-repoinfo > /dev/null
 
   $ hgmo exec hgweb0 grep hgweb /var/log/hg.log
-  * hgweb: * BEGIN_REQUEST mozilla-central * /mozilla-central?cmd=capabilities (glob)
+  2018-08-24T05:00:41.298062+00:00 45ec4c309710 hgweb: a6411a4e-a75a-11e8-b563-0242ac130006 BEGIN_REQUEST /repo_local/mozilla/mozilla/mozilla-central 172.19.0.1 /mozilla-central?cmd=capabilities
   * hgweb: * BEGIN_PROTOCOL capabilities (glob)
-  * hgweb: * END_REQUEST 0 * * (glob)
-  * hgweb: * BEGIN_REQUEST mozilla-central * /mozilla-central?cmd=batch (glob)
+  2018-08-24T05:00:41.309215+00:00 45ec4c309710 hgweb: a6411a4e-a75a-11e8-b563-0242ac130006 END_REQUEST 489 0.011 0.011
+  2018-08-24T05:00:41.551266+00:00 45ec4c309710 hgweb: a667bd0c-a75a-11e8-8253-0242ac130006 BEGIN_REQUEST /repo_local/mozilla/mozilla/mozilla-central 172.19.0.1 /mozilla-central?cmd=batch
   * hgweb: * BEGIN_PROTOCOL batch (glob)
-  * hgweb: * END_REQUEST 0 * * (glob)
-  * hgweb: * BEGIN_REQUEST mozilla-central * /mozilla-central?cmd=getbundle (glob)
+  2018-08-24T05:00:41.566139+00:00 45ec4c309710 hgweb: a667bd0c-a75a-11e8-8253-0242ac130006 END_REQUEST 42 0.015 0.015
+  2018-08-24T05:00:41.782228+00:00 45ec4c309710 hgweb: a68afb50-a75a-11e8-b1e5-0242ac130006 BEGIN_REQUEST /repo_local/mozilla/mozilla/mozilla-central 172.19.0.1 /mozilla-central?cmd=getbundle
   * hgweb: * BEGIN_PROTOCOL getbundle (glob)
   * hgweb: * END_REQUEST 82 * * (glob)
-  * hgweb: * BEGIN_REQUEST mozilla-central * /mozilla-central (glob)
+  2018-08-24T05:00:42.078704+00:00 45ec4c309710 hgweb: a6b8389a-a75a-11e8-8533-0242ac130006 BEGIN_REQUEST /repo_local/mozilla/mozilla/mozilla-central 172.19.0.1 /mozilla-central
   * hgweb: * END_REQUEST 3858 * * (glob)
-  * hgweb: * BEGIN_REQUEST mozilla-central * /mozilla-central/json-repoinfo (glob)
+  2018-08-24T05:00:42.164551+00:00 45ec4c309710 hgweb: a6c54da0-a75a-11e8-8253-0242ac130006 BEGIN_REQUEST /repo_local/mozilla/mozilla/mozilla-central 172.19.0.1 /mozilla-central/json-repoinfo
   * hgweb: * END_REQUEST 23 * * (glob)
 
   $ hgmo clean

ERROR: test-http-syslog.t output changed
!
Failed test-ssh-syslog.t: output changed
Failed test-http-syslog.t: output changed
# Ran 2 tests, 0 skipped, 2 failed.

Comment 1

[Connor Sheehan [:sheehan]]

It seems the tests fail under Mercurial 4.6.2 as well, this may just be a broken test.

Comment 2

[Connor Sheehan [:sheehan]]

Attachment: serverlog: remove Mercurial 4.5 compatibility code (Bug 1485880) r?gps

Since we have upgraded all our servers to 4.6, we don't need this
compatibility code. For simplicity's sake, let's get rid of it.

Comment 3

[Connor Sheehan [:sheehan]]

Attachment: serverlog: add new SSH wireproto command to test output (Bug 1485880) r?gps

Adding the "protocaps" ssh command logging to this test makes
us 4.7 compatible. `test-http-syslog.t` is still failing,
but it is also failing on 4.6.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/5379203a2b75
serverlog: remove Mercurial 4.5 compatibility code r=gps
https://hg.mozilla.org/hgcustom/version-control-tools/rev/69210205e707
serverlog: add new SSH wireproto command to test output r=gps