From 9c99f3f7d7b27bfaf0488e288abfa55d7f2fcb44 Mon Sep 17 00:00:00 2001 From: Juroviol Date: Sat, 21 Apr 2018 12:54:00 -0300 Subject: [PATCH 1/2] Update BaseEmulatorHelper.java System.getenv may return "PATH" as "Path" --- .../main/java/com/google/cloud/testing/BaseEmulatorHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java index b8f7be44874f..47057ff8a098 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java +++ b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java @@ -295,7 +295,7 @@ public Process getProcess() { private boolean isGcloudInstalled() { Map env = System.getenv(); for (String envName : env.keySet()) { - if ("PATH".equals(envName)) { + if ("PATH".equalsIgnoreCase(envName)) { return env.get(envName).contains("google-cloud-sdk"); } } From 37f3365e18ed61c2b3742f1ee3df8b1353dab6dd Mon Sep 17 00:00:00 2001 From: Juroviol Date: Sat, 21 Apr 2018 12:54:59 -0300 Subject: [PATCH 2/2] Update LocalDatastoreHelper.java There is already a updated version http://storage.googleapis.com/gcd/tools/cloud-datastore-emulator-1.4.0.zip --- .../google/cloud/datastore/testing/LocalDatastoreHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 9bf22abf4101..7481aebda133 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -55,7 +55,7 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper { private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start"; private static final String GCLOUD_CMD_PORT_FLAG = "--host-port="; private static final String VERSION_PREFIX = "cloud-datastore-emulator "; - private static final String MIN_VERSION = "1.2.0"; + private static final String MIN_VERSION = "1.4.0"; // Downloadable emulator settings private static final String BIN_NAME = "cloud-datastore-emulator/cloud_datastore_emulator";