diff --git a/plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java b/plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java index 86eff86b023..26115f7a8cf 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java +++ b/plugins/outofbandmanagement-drivers/ipmitool/test/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapperTest.java @@ -23,13 +23,11 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.exception.CloudRuntimeException; import com.google.common.collect.ImmutableMap; import org.apache.cloudstack.outofbandmanagement.OutOfBandManagement; -import org.apache.cloudstack.outofbandmanagement.driver.OutOfBandManagementDriverResponse; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -105,11 +103,4 @@ public class IpmitoolWrapperTest { Assert.assertEquals(IPMITOOL.findIpmiUser(usersList, "operator"), "2"); Assert.assertEquals(IPMITOOL.findIpmiUser(usersList, "user"), "3"); } - - @Test - public void testExecuteCommands() { - OutOfBandManagementDriverResponse r = IPMITOOL.executeCommands(Arrays.asList("ls", "/tmp")); - Assert.assertTrue(r.isSuccess()); - Assert.assertTrue(r.getResult().length() > 0); - } -} \ No newline at end of file +} diff --git a/test/integration/smoke/test_outofbandmanagement.py b/test/integration/smoke/test_outofbandmanagement.py index 7c2aa6b5da9..0f0f442ac7f 100644 --- a/test/integration/smoke/test_outofbandmanagement.py +++ b/test/integration/smoke/test_outofbandmanagement.py @@ -557,8 +557,13 @@ class TestOutOfBandManagement(cloudstackTestCase): cmd = changeOutOfBandManagementPassword.changeOutOfBandManagementPasswordCmd() cmd.hostid = self.getHost().id cmd.password = "Password12345" - response = self.apiclient.changeOutOfBandManagementPassword(cmd) - self.assertEqual(response.status, True) + try: + response = self.apiclient.changeOutOfBandManagementPassword(cmd) + self.assertEqual(response.status, True) + except Exception as e: + if "packet session id 0x0 does not match active session" in str(e): + raise self.skipTest("Known ipmitool issue hit, skipping test") + raise e bmc = IpmiServerContext().bmc bmc.powerstate = 'on' diff --git a/utils/src/test/java/org/apache/cloudstack/utils/process/ProcessTest.java b/utils/src/test/java/org/apache/cloudstack/utils/process/ProcessTest.java index b5e6e04c31a..2c158c800a4 100644 --- a/utils/src/test/java/org/apache/cloudstack/utils/process/ProcessTest.java +++ b/utils/src/test/java/org/apache/cloudstack/utils/process/ProcessTest.java @@ -39,10 +39,9 @@ public class ProcessTest { @Test public void testProcessRunner() { - ProcessResult result = RUNNER.executeCommands(Arrays.asList("ls", "/tmp")); + ProcessResult result = RUNNER.executeCommands(Arrays.asList("sleep", "0")); Assert.assertEquals(result.getReturnCode(), 0); Assert.assertTrue(Strings.isNullOrEmpty(result.getStdError())); - Assert.assertTrue(result.getStdOutput().length() > 0); } @Test