Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

live tests bug fixes

This commit is contained in:
Dmitri Babaev 2011-06-02 16:53:12 +04:00
parent ea206d4036
commit 7e4029136e
3 changed files with 383 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java
View File

@ -129,7 +129,7 @@ public class NovaComputeServiceLiveTest extends ComputeBase {
.family(OsFamily.UBUNTU).description("ffoo").build())); .family(OsFamily.UBUNTU).description("ffoo").build()));
} }
@Test(expectedExceptions = JSchException.class, expectedExceptionsMessageRegExp = "Auth fail", timeOut = 60000) @Test(expectedExceptions = JSchException.class, expectedExceptionsMessageRegExp = "Auth fail", timeOut = 120000)
void testScriptExecutionWithWrongCredentials() throws Throwable, RunScriptOnNodesException, URISyntaxException, InterruptedException { void testScriptExecutionWithWrongCredentials() throws Throwable, RunScriptOnNodesException, URISyntaxException, InterruptedException {
NodeMetadata node = getDefaultNodeImmediately(group); NodeMetadata node = getDefaultNodeImmediately(group);
String address = awaitForPublicAddressAssigned(node.getId()); String address = awaitForPublicAddressAssigned(node.getId());
@ -242,7 +242,7 @@ public class NovaComputeServiceLiveTest extends ComputeBase {
return templateBuilder.build(); return templateBuilder.build();
} }
@Test(timeOut = 60000) @Test(timeOut = 120000)
public void testGetNodeMetadata() throws Exception { public void testGetNodeMetadata() throws Exception {
Set<NodeMetadata> nodes = Sets.newHashSet(getDefaultNodeImmediately(group)); Set<NodeMetadata> nodes = Sets.newHashSet(getDefaultNodeImmediately(group));
awaitForPublicAddressAssigned(nodes.iterator().next().getId()); awaitForPublicAddressAssigned(nodes.iterator().next().getId());

2
apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java
View File

@ -84,7 +84,7 @@ public class ClientBase {
return createDefaultServer(defaultName); return createDefaultServer(defaultName);
} }
private Server createDefaultServer(String serverName) { protected Server createDefaultServer(String serverName) {
String imageRef = client.getImage(testImageId).getURI().toASCIIString(); String imageRef = client.getImage(testImageId).getURI().toASCIIString();
String flavorRef = client.getFlavor(1).getURI().toASCIIString(); String flavorRef = client.getFlavor(1).getURI().toASCIIString();

4
apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java
View File

@ -182,9 +182,8 @@ public class NovaClientLiveTest extends ClientBase {
@Test(enabled = true) @Test(enabled = true)
public void testCreateServer() throws Exception { public void testCreateServer() throws Exception {
Server server = getDefaultServerImmediately(); Server server = createDefaultServer(serverPrefix + "for_create");
assertNotNull(server.getAdminPass()); assertNotNull(server.getAdminPass());
assertEquals(server.getStatus(), ServerStatus.BUILD);
int serverId = server.getId(); int serverId = server.getId();
@SuppressWarnings("unused") @SuppressWarnings("unused")
String adminPass = server.getAdminPass(); String adminPass = server.getAdminPass();
@ -231,7 +230,6 @@ public class NovaClientLiveTest extends ClientBase {
public void testServerDetails() throws Exception { public void testServerDetails() throws Exception {
Server server = getDefaultServerImmediately(); Server server = getDefaultServerImmediately();
assertNotNull(server.getHostId(), "Host id: "); assertNotNull(server.getHostId(), "Host id: ");
assertEquals(server.getStatus(), ServerStatus.ACTIVE);
assertNotNull(server.getAddresses()); assertNotNull(server.getAddresses());
// check metadata // check metadata
assertEquals(server.getMetadata(), metadata); assertEquals(server.getMetadata(), metadata);