cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/4.9 to a4b1688
Date Wed, 26 Oct 2016 08:56:11 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 770397c0a -> a4b1688f7


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 <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29844a3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29844a3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29844a3e

Branch: refs/heads/4.9
Commit: 29844a3ec94e1dc40da9c6ac90d5345b89e82360
Parents: 770397c
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Oct 26 10:31:35 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Oct 26 10:31:35 2016 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_outofbandmanagement.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29844a3e/test/integration/smoke/test_outofbandmanagement.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_outofbandmanagement.py b/test/integration/smoke/test_outofbandmanagement.py
index 0f0f442..122fcfc 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)


Mime
View raw message