summaryrefslogtreecommitdiff
path: root/heat/tests/test_convg_stack.py
diff options
context:
space:
mode:
authorrabi <ramishra@redhat.com>2018-02-20 15:48:10 +0530
committerrabi <ramishra@redhat.com>2018-02-20 18:28:48 +0530
commite09b879a289f10bf50353a7c4dd64df5566cb9cd (patch)
tree01db220b914e7dc6f2a2c9877ba22b1b677ab70c /heat/tests/test_convg_stack.py
parent797c9d4d66e4cf15d62f4263a875704145b20da4 (diff)
downloadheat-e09b879a289f10bf50353a7c4dd64df5566cb9cd.tar.gz
Fix convergence unit tests for py36
Change-Id: I90d68a9b35a1f23195b7153eba83f2bcd0ae6ef6 Closes-Bug: #1750252
Diffstat (limited to 'heat/tests/test_convg_stack.py')
-rw-r--r--heat/tests/test_convg_stack.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/heat/tests/test_convg_stack.py b/heat/tests/test_convg_stack.py
index 1d985035a..191a7b3e8 100644
--- a/heat/tests/test_convg_stack.py
+++ b/heat/tests/test_convg_stack.py
@@ -65,7 +65,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
self.assertTrue(stack_db.convergence)
self.assertEqual({'edges': [[[1, True], None]]}, stack_db.current_deps)
- leaves = stack.convergence_dependencies.leaves()
+ leaves = set(stack.convergence_dependencies.leaves())
expected_calls = []
for rsrc_id, is_update in sorted(leaves, key=lambda n: n.is_update):
expected_calls.append(
@@ -121,7 +121,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
self.assertIsNotNone(sync_point)
self.assertEqual(stack_db.id, sync_point.stack_id)
- leaves = stack.convergence_dependencies.leaves()
+ leaves = set(stack.convergence_dependencies.leaves())
expected_calls = []
for rsrc_id, is_update in sorted(leaves, key=lambda n: n.is_update):
expected_calls.append(
@@ -261,7 +261,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
self.assertIsNotNone(sync_point)
self.assertEqual(stack_db.id, sync_point.stack_id)
- leaves = stack.convergence_dependencies.leaves()
+ leaves = set(stack.convergence_dependencies.leaves())
expected_calls = []
for rsrc_id, is_update in sorted(leaves, key=lambda n: n.is_update):
expected_calls.append(
@@ -344,7 +344,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
self.assertIsNotNone(sync_point, 'entity %s' % entity_id)
self.assertEqual(stack_db.id, sync_point.stack_id)
- leaves = stack.convergence_dependencies.leaves()
+ leaves = set(stack.convergence_dependencies.leaves())
expected_calls = []
for rsrc_id, is_update in sorted(leaves, key=lambda n: n.is_update):
expected_calls.append(
@@ -353,7 +353,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase):
{'input_data': {}},
is_update, None, False))
- leaves = curr_stack.convergence_dependencies.leaves()
+ leaves = set(curr_stack.convergence_dependencies.leaves())
for rsrc_id, is_update in sorted(leaves, key=lambda n: n.is_update):
expected_calls.append(
mock.call.worker_client.WorkerClient.check_resource(