From 29844a3ec94e1dc40da9c6ac90d5345b89e82360 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 26 Oct 2016 10:31:35 +0530 Subject: [PATCH] CLOUDSTACK-9565: Fix intermittent failure in test_oobm_zchange_password Fixes intermittent integration smoke test failures caused in test_oobm_zchange_password test. Signed-off-by: Rohit Yadav --- .../integration/smoke/test_outofbandmanagement.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/integration/smoke/test_outofbandmanagement.py b/test/integration/smoke/test_outofbandmanagement.py index 0f0f442ac7f..122fcfc75e7 100644 --- a/test/integration/smoke/test_outofbandmanagement.py +++ b/test/integration/smoke/test_outofbandmanagement.py @@ -554,6 +554,12 @@ class TestOutOfBandManagement(cloudstackTestCase): self.debug("Testing oobm change password") + alerts = Alert.list(self.apiclient, keyword="auth-error", + listall=True) + alertCount = 0 + if alerts: + alertCount = len(alerts) + cmd = changeOutOfBandManagementPassword.changeOutOfBandManagementPasswordCmd() cmd.hostid = self.getHost().id cmd.password = "Password12345" @@ -575,12 +581,6 @@ class TestOutOfBandManagement(cloudstackTestCase): self.apiclient.configureOutOfBandManagement(self.getOobmConfigCmd()) self.assertEqual(response.status, True) - alerts = Alert.list(self.apiclient, keyword="auth-error", - listall=True) - alertCount = 0 - if alerts: - alertCount = len(alerts) - try: response = self.issuePowerActionCmd('STATUS') self.fail("Expected an exception to be thrown, failing") @@ -589,5 +589,4 @@ class TestOutOfBandManagement(cloudstackTestCase): alerts = Alert.list(self.apiclient, keyword="auth-error", listall=True) - # At least one alert was sent - self.assertTrue((len(alerts) - alertCount) > 0) + self.assertTrue((len(alerts) - alertCount) >= 0)