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

Merge branch 'master' of github.com:jclouds/jclouds 

* 'master' of github.com:jclouds/jclouds:
  fixed properties used in epc testing
This commit is contained in:
Adrian Cole 2011-01-24 09:21:17 -08:00
parent 85d05bdb91 f1b4b67a88
commit 033703aa3c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/resources/rest.properties
View File

@ -175,7 +175,7 @@ walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder
walrus.propertiesbuilder=org.jclouds.walrus.WalrusPropertiesBuilder
eucalyptus-partnercloud-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder
eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.ecc.EucalyptusPartnerCloudWalrusPropertiesBuilder
eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.epc.EucalyptusPartnerCloudWalrusPropertiesBuilder
googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder
googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder

2
providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java
View File

@ -51,7 +51,7 @@ public class EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest extends Bas
public boolean apply(OsFamilyVersion64Bit input) {
return input.family == OsFamily.RHEL || //
(input.family == OsFamily.CENTOS && !input.version.equals("5.3") || !input.is64Bit) || //
input.family == OsFamily.WINDOWS || //
(input.family == OsFamily.WINDOWS && !(input.version.equals("2008") && input.is64Bit)) || //
input.family == OsFamily.UBUNTU;
}

4
providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java
View File

@ -29,8 +29,8 @@ import org.testng.annotations.Test;
public class EucalyptusPartnerCloudWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled {
public EucalyptusPartnerCloudWalrusAsyncClientTestDisabled() {
this.provider = "ecc";
this.url = "commondatastorage.googleapis.com";
this.provider = "eucalyptus-partnercloud-s3";
this.url = "https://partnercloud.eucalyptus.com:8773/services/Walrus";
}
// TODO parameterize this test so that it can pass

2
providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java
View File

@ -37,7 +37,7 @@ import com.google.inject.Module;
public class EucalyptusPartnerCloudWalrusTestInitializer extends TransientBlobStoreTestInitializer {
public EucalyptusPartnerCloudWalrusTestInitializer() {
provider = "ecc-s3";
provider = "eucalyptus-partnercloud-s3";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}