mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-9299: Fix test failures on CI
- Fixes oobm integration test to skip if known ipmitool bug is hit - Fixes ProcessTest unit test case to use sleep - Removes redundant unit test that covers code in ProcessTest Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
parent
540d9572fd
commit
ae0f169123
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue