hghooks: add updated output to merge day hooks test (Bug 1720188) r=zeid
authorConnor Sheehan <sheehan@mozilla.com>
Tue, 24 Aug 2021 16:03:45 +0000
changeset 7718 7ba5ce469e076e900780e4fa4f8a5b6ba829922f
parent 7717 66d24209682b9dc422c13050d7ad568f2d52f480
child 7719 5cd6a3a054e34335131be9408a937696a6e70298
push id3863
push usercosheehan@mozilla.com
push dateTue, 24 Aug 2021 16:05:52 +0000
treeherderversion-control-tools@177006efefb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerszeid
bugs1720188
hghooks: add updated output to merge day hooks test (Bug 1720188) r=zeid Adding this output to the tests was missed in D121668. Depends on D123473 Differential Revision: https://phabricator.services.mozilla.com/D123474
hghooks/tests/test-merge-day.t
--- a/hghooks/tests/test-merge-day.t
+++ b/hghooks/tests/test-merge-day.t
@@ -275,16 +275,18 @@ tbbld-merge user cannot push non-merge d
   tbbld-merge can only push changes to
   the following paths:
   .gecko_rev.yml
   .hgtags
   mail/config/mozconfigs/
   mail/config/version.txt
   mail/config/version_display.txt
   mail/locales/l10n-changesets.json
+  suite/config/version.txt
+  suite/config/version_display.txt
   
   Illegal paths found:
   file0a
   other/file1a
   ************************************
   
   transaction abort!
   rollback completed
@@ -306,27 +308,30 @@ tbbld-merge user cannot push non-merge d
   tbbld-merge can only push changes to
   the following paths:
   .gecko_rev.yml
   .hgtags
   mail/config/mozconfigs/
   mail/config/version.txt
   mail/config/version_display.txt
   mail/locales/l10n-changesets.json
+  suite/config/version.txt
+  suite/config/version_display.txt
   
   Illegal paths found:
   file0a
   other/file1a
   ************************************
   
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.mozhooks hook failed
   [255]
 
+
 tbbld-merge can push changes that have been pushed to comm-central
 
   $ USER=someone@example.com hg push $TESTTMP/comm-central
   pushing to $TESTTMP/comm-central
   searching for changes
   adding changesets
   adding manifests
   adding file changes