From 837a3dc0151233ded9e5513e21f6f06d36ec6ae3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 25 Apr 2024 10:20:59 +0100 Subject: [PATCH] tests: Fix trivial sorting issue We've seen an ordering issue pop up occasionally in the CI. Resolve it. Change-Id: I4dd10268b673c260ac0894fac92cd8bea9e626f4 Signed-off-by: Stephen Finucane --- openstackclient/identity/v3/tag.py | 4 ++-- openstackclient/tests/unit/identity/v3/test_project.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openstackclient/identity/v3/tag.py b/openstackclient/identity/v3/tag.py index 7a9321866..ce1dfe891 100644 --- a/openstackclient/identity/v3/tag.py +++ b/openstackclient/identity/v3/tag.py @@ -129,7 +129,7 @@ def update_tags_in_args(parsed_args, obj, args): args['tags'] = [] obj.tags = [] if parsed_args.remove_tag: - args['tags'] = list(set(obj.tags) - set(parsed_args.remove_tag)) + args['tags'] = sorted(set(obj.tags) - set(parsed_args.remove_tag)) return if parsed_args.tags: - args['tags'] = list(set(obj.tags).union(set(parsed_args.tags))) + args['tags'] = sorted(set(obj.tags).union(set(parsed_args.tags))) diff --git a/openstackclient/tests/unit/identity/v3/test_project.py b/openstackclient/tests/unit/identity/v3/test_project.py index d9427e37c..ffef854e9 100644 --- a/openstackclient/tests/unit/identity/v3/test_project.py +++ b/openstackclient/tests/unit/identity/v3/test_project.py @@ -1130,7 +1130,7 @@ class TestProjectSet(TestProject): # Set expected values. new tag is added to original tags for update. kwargs = { 'name': 'qwerty', - 'tags': list(set(['tag1', 'tag2', 'tag3', 'foo'])), + 'tags': sorted(set(['tag1', 'tag2', 'tag3', 'foo'])), } # ProjectManager.update(project, name=, domain=, description=, # enabled=, **kwargs)