From ffc1412ed51b9e30b38419eaaac7ec3958f753f6 Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Mon, 10 Apr 2017 17:00:57 +0200 Subject: [PATCH] Fix calls to call_until_true Some tests use call_until_true, but don't check the returned value. If False, the check isn't actually correct. Change-Id: I6625a2e57d1d1c1ac03647786c210a9b57490562 --- .../functional/test_heat_autoscaling.py | 30 +++++++++++-------- .../functional/test_notifications.py | 6 ++-- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/heat_integrationtests/functional/test_heat_autoscaling.py b/heat_integrationtests/functional/test_heat_autoscaling.py index 25ceb1c33b..096c427353 100644 --- a/heat_integrationtests/functional/test_heat_autoscaling.py +++ b/heat_integrationtests/functional/test_heat_autoscaling.py @@ -114,10 +114,12 @@ outputs: for num in range(asg_size+1, max_size+2): expected_resources = num if num <= max_size else max_size self.client.resources.signal(stack_id, 'scale_up_policy') - test.call_until_true(self.conf.build_timeout, - self.conf.build_interval, - self.check_autoscale_complete, - asg.physical_resource_id, expected_resources) + self.assertTrue( + test.call_until_true(self.conf.build_timeout, + self.conf.build_interval, + self.check_autoscale_complete, + asg.physical_resource_id, + expected_resources)) def test_asg_scale_down_min_size(self): stack_id = self.stack_create(template=self.template, @@ -133,10 +135,12 @@ outputs: for num in range(asg_size-1, 0, -1): expected_resources = num if num >= min_size else min_size self.client.resources.signal(stack_id, 'scale_down_policy') - test.call_until_true(self.conf.build_timeout, - self.conf.build_interval, - self.check_autoscale_complete, - asg.physical_resource_id, expected_resources) + self.assertTrue( + test.call_until_true(self.conf.build_timeout, + self.conf.build_interval, + self.check_autoscale_complete, + asg.physical_resource_id, + expected_resources)) def test_asg_cooldown(self): cooldown_tmpl = self.template.replace('cooldown: 0', @@ -153,10 +157,12 @@ outputs: asg = self.client.resources.get(stack_id, 'random_group') expected_resources = 3 self.client.resources.signal(stack_id, 'scale_up_policy') - test.call_until_true(self.conf.build_timeout, - self.conf.build_interval, - self.check_autoscale_complete, - asg.physical_resource_id, expected_resources) + self.assertTrue( + test.call_until_true(self.conf.build_timeout, + self.conf.build_interval, + self.check_autoscale_complete, + asg.physical_resource_id, + expected_resources)) def test_path_attrs(self): stack_id = self.stack_create(template=self.template) diff --git a/heat_integrationtests/functional/test_notifications.py b/heat_integrationtests/functional/test_notifications.py index 924ef0c885..69029a7751 100644 --- a/heat_integrationtests/functional/test_notifications.py +++ b/heat_integrationtests/functional/test_notifications.py @@ -180,12 +180,14 @@ outputs: auto_declare=False): requests.post(scale_up_url, verify=self.verify_cert) - test.call_until_true(20, 0, self.consume_events, handler, 2) + self.assertTrue( + test.call_until_true(20, 0, self.consume_events, handler, 2)) notifications += handler.notifications handler.clear() requests.post(scale_down_url, verify=self.verify_cert) - test.call_until_true(20, 0, self.consume_events, handler, 2) + self.assertTrue( + test.call_until_true(20, 0, self.consume_events, handler, 2)) notifications += handler.notifications self.assertEqual(2, notifications.count(ASG_NOTIFICATIONS[0]))