Merge branch '4.9'

Author: yadvr

test/integration/smoke/test_outofbandmanagement.py

@@ -554,6 +554,12 @@ def test_oobm_zchange_password(self):
 
         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 @@ def test_oobm_zchange_password(self):
         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 @@ def test_oobm_zchange_password(self):
         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)