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

Merge pull request #249 from aplowe/master 

Fixing problem during configuration of TerremarkECloudClientLiveTest and TerremarkVCloudExpressClientLiveTest
This commit is contained in:
Adrian Cole 2011-12-15 15:02:48 -08:00
parent 1fd77eb348 3df4ec3280
commit a221e5131e
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java
View File

@ -107,6 +107,10 @@ public abstract class TerremarkClientLiveTest extends BaseVersionedServiceLiveTe
protected VDC vdc; protected VDC vdc;
public static final String PREFIX = System.getProperty("user.name") + "-terremark"; public static final String PREFIX = System.getProperty("user.name") + "-terremark";
public TerremarkClientLiveTest() {
this.provider = "trmk-vcloudexpress";
}
@Test @Test
public void testKeysList() throws Exception { public void testKeysList() throws Exception {
for (Org org : orgs) { for (Org org : orgs) {
@ -456,12 +460,6 @@ public abstract class TerremarkClientLiveTest extends BaseVersionedServiceLiveTe
} }
protected String provider = "trmk-vcloudexpress";
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
@BeforeGroups(groups = { "live" }) @BeforeGroups(groups = { "live" })
public void setupClient() { public void setupClient() {
setupCredentials(); setupCredentials();

14
providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientLiveTest.java
View File

@ -44,6 +44,13 @@ import org.testng.annotations.Test;
*/ */
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "TerremarkECloudClientLiveTest") @Test(groups = "live", enabled = true, singleThreaded = true, testName = "TerremarkECloudClientLiveTest")
public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest { public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
public TerremarkECloudClientLiveTest() {
this.provider = "trmk-ecloud";
this.itemName = "Ubuntu Server 10.04 x64";
this.expectedOs = "Ubuntu Linux (64-bit)";
}
@Override @Override
protected Properties setupProperties() { protected Properties setupProperties() {
Properties props = super.setupProperties(); Properties props = super.setupProperties();
@ -52,13 +59,6 @@ public class TerremarkECloudClientLiveTest extends TerremarkClientLiveTest {
return props; return props;
} }
@BeforeClass
void setProvider() {
this.provider = "trmk-ecloud";
this.itemName = "Ubuntu Server 10.04 x64";
expectedOs = "Ubuntu Linux (64-bit)";
}
@Override @Override
protected InstantiateVAppTemplateOptions createInstantiateOptions() { protected InstantiateVAppTemplateOptions createInstantiateOptions() {
return processorCount(1).memory(512); return processorCount(1).memory(512);