Fixed order of delete command and disabled post-build SSH check

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1828 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-07-21 17:19:42 +00:00
parent 8d124e8b7e
commit 85e24279e1
1 changed files with 7 additions and 2 deletions

View File

@ -25,6 +25,7 @@ package org.jclouds.rackspace.cloudservers;
import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withFile; import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withFile;
import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer;
import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails;
import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY;
import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -344,6 +345,10 @@ public class CloudServersConnectionLiveTest {
try { try {
doCheckPass(newDetails, pass); doCheckPass(newDetails, pass);
} catch (SshException e) {// try twice in case there is a network timeout } catch (SshException e) {// try twice in case there is a network timeout
try {
Thread.sleep(2 * 1000);
} catch (InterruptedException e1) {
}
doCheckPass(newDetails, pass); doCheckPass(newDetails, pass);
} }
} }
@ -472,8 +477,8 @@ public class CloudServersConnectionLiveTest {
testUnshare(); testUnshare();
} }
// must be last!. current order is only positionally guaranteed when in sequential mode. // must be last!. do not rely on positional order.
@Test @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = "testShareNoConfig")
void deleteServers() { void deleteServers() {
if (serverId > 0) { if (serverId > 0) {
connection.deleteServer(serverId); connection.deleteServer(serverId);