author | Gregory Szorc <gps@mozilla.com> |
Mon, 03 Apr 2017 13:48:44 -0700 | |
changeset 10643 | f0cca5f89199aae20f68083fa6818eb6ad462288 |
parent 10642 | 0335d2f40ab2d3daad0e1466a55a0f3f030d1723 |
child 10644 | 4b7e8a1fc9482a70dcab7df6f3085991ecc3abbf |
child 10648 | b570ee86ca455142b249a8e68bd1858eb6f03a3a |
push id | 1600 |
push user | bmo:gps@mozilla.com |
push date | Mon, 03 Apr 2017 23:38:00 +0000 |
reviewers | glob |
bugs | 1333616 |
--- a/hgserver/tests/test-obsolescence.t +++ b/hgserver/tests/test-obsolescence.t @@ -302,17 +302,17 @@ and we're not in the allowed user list $ hgmo exec hgssh /var/hg/venv_pash/bin/hg -R /repo/hg/mozilla/integration/autoland debugobsolete hgweb advertise marker exchange $ http --no-headers "${HGWEB_0_URL}integration/autoland?cmd=capabilities" 200 - lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=6144 httppostargs pushlog + lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=6144 httppostargs httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib pushlog Allow this user to send obsolescence markers (since the per-repo hgrc will get replicated and take precedence on the mirror, we need to add the allowed user from the replication processes on both server and mirror) $ hgmo exec hgssh /set-hgrc-option integration/autoland obshacks obsolescenceexchangeusers "user@example.com,vcs-sync@mozilla.com,hg" $ hgmo exec hgssh /var/hg/venv_pash/bin/hg -R /repo/hg/mozilla/integration/autoland replicatehgrc recorded hgrc in replication log @@ -347,13 +347,13 @@ And they should get replicated to mirror 5fb779ae39de4af3229a53c35d46117e98fb5f83 d57129f00b2f329fc2cf3371a0c28796bcfbde1c 0 (*) {'user': 'Test User <someone@example.com>'} (glob) d57129f00b2f329fc2cf3371a0c28796bcfbde1c 9e2d548e5f1f94b9172cfeb77b53f5943722b594 0 (*) {'user': 'Test User <someone@example.com>'} (glob) hgweb should still advertise marker exchange $ http --no-headers "${HGWEB_0_URL}integration/autoland?cmd=capabilities" 200 - lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=6144 httppostargs pushlog + lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=6144 httppostargs httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib pushlog $ cd .. $ hgmo clean