You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/02/12 21:10:36 UTC
jclouds-labs-google git commit: enabling running live tests with
.json key format
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master 17fb520c2 -> 2e8fef5d0
enabling running live tests with .json key format
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/2e8fef5d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/2e8fef5d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/2e8fef5d
Branch: refs/heads/master
Commit: 2e8fef5d0ba64ad3e5c25f0065a1c84b8b5b00e5
Parents: 17fb520
Author: Daniel Broudy <br...@google.com>
Authored: Tue Feb 10 13:29:39 2015 -0800
Committer: Daniel Broudy <br...@google.com>
Committed: Wed Feb 11 15:07:04 2015 -0800
----------------------------------------------------------------------
.../GoogleCloudStorageBlobIntegrationLiveTest.java | 1 +
.../integration/GoogleCloudStorageBlobLiveTest.java | 1 +
.../GoogleCloudStorageContainerIntegrationLiveTest.java | 1 +
.../integration/GoogleCloudStorageContainerLiveTest.java | 1 +
.../internal/BaseGoogleCloudStorageApiLiveTest.java | 8 ++++++--
5 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2e8fef5d/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java
index 92eeb04..c878e52 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobIntegrationLiveTest.java
@@ -69,6 +69,7 @@ public class GoogleCloudStorageBlobIntegrationLiveTest extends BaseBlobIntegrati
}
@Override protected Properties setupProperties() {
+ TestProperties.setGoogleCredentialsFromJson(provider);
Properties properties = super.setupProperties();
properties.put("jclouds.mpu.parts.size", 2 * 1024 * 1024);
return TestProperties.apply(provider, properties);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2e8fef5d/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobLiveTest.java
index 6662826..2584b02 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageBlobLiveTest.java
@@ -53,6 +53,7 @@ public class GoogleCloudStorageBlobLiveTest extends BaseBlobLiveTest {
}
@Override protected Properties setupProperties() {
+ TestProperties.setGoogleCredentialsFromJson(provider);
return TestProperties.apply(provider, super.setupProperties());
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2e8fef5d/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java
index 8ef8cd8..c129ae8 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java
@@ -46,6 +46,7 @@ public class GoogleCloudStorageContainerIntegrationLiveTest extends BaseContaine
}
@Override protected Properties setupProperties() {
+ TestProperties.setGoogleCredentialsFromJson(provider);
return TestProperties.apply(provider, super.setupProperties());
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2e8fef5d/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java
index 882a2ed..559713b 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java
@@ -30,6 +30,7 @@ public class GoogleCloudStorageContainerLiveTest extends BaseContainerLiveTest {
}
@Override protected Properties setupProperties() {
+ TestProperties.setGoogleCredentialsFromJson(provider);
return TestProperties.apply(provider, super.setupProperties());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2e8fef5d/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiLiveTest.java
index b69b4c3..ea4e97f 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiLiveTest.java
@@ -19,6 +19,7 @@ package org.jclouds.googlecloudstorage.internal;
import java.util.Properties;
import org.jclouds.apis.BaseApiLiveTest;
+import org.jclouds.googlecloud.config.CurrentProject;
import org.jclouds.googlecloud.internal.TestProperties;
import org.jclouds.googlecloudstorage.GoogleCloudStorageApi;
import org.jclouds.googlecloudstorage.GoogleCloudStorageProviderMetadata;
@@ -29,7 +30,7 @@ import com.google.inject.Module;
public class BaseGoogleCloudStorageApiLiveTest extends BaseApiLiveTest<GoogleCloudStorageApi> {
- protected static final String PROJECT_NUMBER = System.getProperty("test.google-cloud-storage.project-number");
+ protected static String PROJECT_NUMBER;
protected BaseGoogleCloudStorageApiLiveTest() {
provider = "google-cloud-storage";
@@ -40,7 +41,10 @@ public class BaseGoogleCloudStorageApiLiveTest extends BaseApiLiveTest<GoogleClo
}
@Override protected Properties setupProperties() {
- return TestProperties.apply(provider, super.setupProperties());
+ TestProperties.setGoogleCredentialsFromJson(provider);
+ Properties props = TestProperties.apply(provider, super.setupProperties());
+ PROJECT_NUMBER = CurrentProject.ClientEmail.toProjectNumber(System.getProperty("test.google-cloud-storage.identity"));
+ return props;
}
@Override protected GoogleCloudStorageApi create(Properties props, Iterable<Module> modules) {