gecko-dev/testing/web-platform/python.ini

[DEFAULT]
subsuite = mozbase
[test_metamerge.py]
Bug 1571755 - Add a command for merging wpt metadata, r=maja_zf This command is inteded to be usable as a git mergetool for the specific case of merging ini files in a way that should always succeed, produces reasonably likely output, but isn't reliably correct. The main use case is for the sync bot where we update metadata on branches and experience conflicts when we also have changes on master. We don't necessarily need to resolve these perfectly but we do need to provide a resolution automatically since otherwise it blocks syncs. Since the ini parser is in-tree we want to make this an in-tree command that the sync can use to provide the resolution. The general strategy is that we want to prefer the "new" metadata where possible. This won't always be correct e.g. if a test got fixed on master and simultaneously got edited to go from TIMEOUT to FAIL in a browser without the fix. But it's not a bad approximation (and generally a human will struggle to do the merge better by hand, so we have to assume later try jobs will fix things). Differential Revision: https://phabricator.services.mozilla.com/D40832 --HG-- extra : moz-landing-system : lando 2019-08-09 20:48:53 +03:00			`[DEFAULT]`
			`subsuite = mozbase`
			`[test_metamerge.py]`