This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-unit-tests.git
commit 59a6d3878e3f5023eb40a4af9c5f495bc7237122 Author: Sebb <[email protected]> AuthorDate: Mon Aug 24 00:16:56 2020 +0100 Put later generators last; keep key order --- tests/test-generators.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test-generators.py b/tests/test-generators.py index 8a6d8f4..c0f08b1 100755 --- a/tests/test-generators.py +++ b/tests/test-generators.py @@ -24,7 +24,8 @@ def generate_specs(args): import plugins.generators as generators yml = {} generator_names = generators.generator_names() if hasattr(generators, 'generator_names') else ['full', 'medium', 'cluster', 'legacy'] - for gen_type in generator_names: + # sort so most recent generators come last to make comparisons easier + for gen_type in sorted(generator_names, key=lambda s: s.replace('dkim','zkim')): test_args = collections.namedtuple('testargs', ['parse_html', 'generator'])(parse_html, gen_type) archie = interfacer.Archiver(archiver, test_args) sys.stderr.write("Generating specs for type '%s'...\n" % gen_type) @@ -43,7 +44,8 @@ def generate_specs(args): }) yml[gen_type] = gen_spec with open(args.generate, 'w') as f: - yaml.dump({'args': {'cmd': " ".join(sys.argv)}, 'generators': {args.mboxfile: yml}}, f) + # don't sort keys here + yaml.dump({'args': {'cmd': " ".join(sys.argv)}, 'generators': {args.mboxfile: yml}}, f, sort_keys=False) f.close()
