From 5c4c794b1bd5818c135fcd3a7c765c9b928f353a Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Mon, 12 Feb 2018 15:42:54 +0000 Subject: [PATCH] Fix a race condition with execution creation During the pagination test two workflows are created in quick succession. If this happens within the same second then the order wont always be the creation order. This change bases the order on how they were returned in the original execution-list output. Change-Id: Ibd93dfe5257bc601515a06f5fb45dd7ab82a5618 --- .../tests/functional/cli/v2/cli_tests_v2.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py index 5c2b2c91..0230c83d 100644 --- a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py +++ b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py @@ -788,17 +788,17 @@ class ExecutionCLITests(base_v2.MistralClientTestBase): self.assertEqual(wrapping_task_id, wf_exec['Task Execution ID']) def test_executions_list_with_pagination(self): - wf_ex1 = self.execution_create( + self.execution_create( params='{0} -d "a"'.format(self.direct_wf['Name']) ) - wf_ex2 = self.execution_create( + self.execution_create( params='{0} -d "b"'.format(self.direct_wf['Name']) ) - wf_execs = self.mistral_cli(True, 'execution-list') + all_wf_execs = self.mistral_cli(True, 'execution-list') - self.assertEqual(2, len(wf_execs)) + self.assertEqual(2, len(all_wf_execs)) wf_execs = self.mistral_cli( True, @@ -808,8 +808,8 @@ class ExecutionCLITests(base_v2.MistralClientTestBase): self.assertEqual(1, len(wf_execs)) - wf_ex1_id = self.get_field_value(wf_ex1, 'ID') - wf_ex2_id = self.get_field_value(wf_ex2, 'ID') + wf_ex1_id = all_wf_execs[0]['ID'] + wf_ex2_id = all_wf_execs[1]['ID'] wf_execs = self.mistral_cli( True,