testing: fixes broken tests r=sheehan
authorMitchell Hentges <mhentges@mozilla.com>
Thu, 28 Nov 2019 18:30:48 +0000
changeset 7340 b45e317b59179616d822524ed6cae2f33868311b
parent 7339 e5237f4d3be64e760165246ee10d487cbf21da31
child 7341 1df6737f9d8ee9584a29f1b5a10a0bc33aaa1b8b
push id3631
push usercosheehan@mozilla.com
push dateThu, 28 Nov 2019 18:31:13 +0000
treeherderversion-control-tools@b45e317b5917 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssheehan
testing: fixes broken tests r=sheehan Some of these tests have been broken for a while (output has been changed), so this should just ensure our suite is green again. Differential Revision: https://phabricator.services.mozilla.com/D55164
hgext/serverlog/tests/test-http-syslog.t
hgserver/tests/test-clonebundles.t
pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
--- a/hgext/serverlog/tests/test-http-syslog.t
+++ b/hgext/serverlog/tests/test-http-syslog.t
@@ -25,13 +25,13 @@ Mercurial wire protocol commands and HTT
   * hgweb: * END_REQUEST 516 * * (glob)
   * hgweb: * BEGIN_REQUEST /mozilla-central * /mozilla-central?cmd=batch (glob)
   * hgweb: * BEGIN_PROTOCOL batch (glob)
   * hgweb: * END_REQUEST 42 * * (glob)
   * hgweb: * BEGIN_REQUEST /mozilla-central * /mozilla-central?cmd=getbundle (glob)
   * hgweb: * BEGIN_PROTOCOL getbundle (glob)
   * hgweb: * END_REQUEST 82 * * (glob)
   * hgweb: * BEGIN_REQUEST /mozilla-central * /mozilla-central (glob)
-  * hgweb: * END_REQUEST 3822 * * (glob)
+  * hgweb: * END_REQUEST 3708 * * (glob)
   * hgweb: * BEGIN_REQUEST /mozilla-central * /mozilla-central/json-repoinfo (glob)
   * hgweb: * END_REQUEST 23 * * (glob)
 
   $ hgmo clean
--- a/hgserver/tests/test-clonebundles.t
+++ b/hgserver/tests/test-clonebundles.t
@@ -162,17 +162,16 @@ Fetching with a GCE IP will limit to GCE
 
 Fetching with a private IP and a cloud metadata file indicating host region is us-west-2 will limit to same region URLs
 Reload apache after setting config, so processes pick up the new config
 
   $ hgmo exec hgweb0 /set-config-option /etc/mercurial/hgrc hgmo "instance-data-path" "/var/hg/test_instance_data.json"
   $ hgmo exec hgweb0 supervisorctl restart httpd
   httpd: stopped
   httpd: started
-  
   $ http --no-headers --request-header "Remote-Addr: 10.144.1.1" ${HGWEB_0_URL}mozilla-central?cmd=clonebundles
   200
   
   https://s3-us-west-2.amazonaws.com/moz-hg-bundles-us-west-2/mozilla-central/77538e1ce4bec5f7aac58a7ceca2da0e38e90a72.packed1.hg BUNDLESPEC=none-packed1;requirements%3Dgeneraldelta%2Crevlogv1 ec2region=us-west-2
   https://s3-us-west-2.amazonaws.com/moz-hg-bundles-us-west-2/mozilla-central/77538e1ce4bec5f7aac58a7ceca2da0e38e90a72.zstd.hg BUNDLESPEC=zstd-v2 ec2region=us-west-2
   https://s3-us-west-2.amazonaws.com/moz-hg-bundles-us-west-2/mozilla-central/77538e1ce4bec5f7aac58a7ceca2da0e38e90a72.gzip-v2.hg BUNDLESPEC=gzip-v2 ec2region=us-west-2
   
 
--- a/pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
+++ b/pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
@@ -242,17 +242,16 @@ Creating obsolescence marker directly on
   $ consumer --onetime
   vcsreplicator.consumer processing heartbeat-1 from partition 2 offset 15
   $ consumer --onetime
   vcsreplicator.consumer processing heartbeat-1 from partition 2 offset 16
   $ consumer --onetime
   vcsreplicator.consumer processing hg-pushkey-1 from partition 2 offset 17
   vcsreplicator.consumer executing pushkey on $TESTTMP/repos/obs for obsolete[dump0]
   vcsreplicator.consumer   $ hg debugpushkey $TESTTMP/repos/obs obsolete dump0 '' '*' (glob)
-  vcsreplicator.consumer   > 1 new obsolescence markers
   vcsreplicator.consumer   > obsoleted 1 changesets
   vcsreplicator.consumer   > True
   vcsreplicator.consumer   [0]
 
   $ hgmo exec hgweb0 /var/hg/venv_replication/bin/vcsreplicator-consumer --wait-for-no-lag /etc/mercurial/vcsreplicator.ini
   $ hgmo exec hgweb0 /var/hg/venv_replication/bin/hg -R /repo/hg/mozilla/obs debugobsolete
   11bec8a6b2a30ac170575ecfd7a06af5a75e2d77 67b45555a21f4d9d470adc4f1ed3af63918f6414 0 (*) {*'user': 'Test User <someone@example.com>'} (glob)
   67b45555a21f4d9d470adc4f1ed3af63918f6414 0 (*) {'user': 'root@*'} (glob)