geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject [geode] branch develop updated: GEODE-4042: Cargo tests will use java.io.tmpdir if possible, instead /tmp (#1114)
Date Mon, 04 Dec 2017 18:47:37 GMT
This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 34928a6  GEODE-4042: Cargo tests will use java.io.tmpdir if possible, instead /tmp
(#1114)
34928a6 is described below

commit 34928a6becf7f59c42e04d96186667e52441145c
Author: Jason Huynh <huynhja@gmail.com>
AuthorDate: Mon Dec 4 10:47:35 2017 -0800

    GEODE-4042: Cargo tests will use java.io.tmpdir if possible, instead /tmp (#1114)
---
 .../java/org/apache/geode/session/tests/ContainerInstall.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
index 5064c22..4409d17 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
@@ -63,10 +63,11 @@ public abstract class ContainerInstall {
   private final String MODULE_PATH;
   private final String WAR_FILE_PATH;
 
+  public static final String TMP_DIR = System.getProperty("java.io.tmpdir", "/tmp");
   public static final String GEODE_BUILD_HOME = System.getenv("GEODE_HOME");
-  public static final String DEFAULT_INSTALL_DIR = "/tmp/cargo_containers/";
+  public static final String DEFAULT_INSTALL_DIR = TMP_DIR + "/cargo_containers/";
   protected static final String DEFAULT_MODULE_LOCATION = GEODE_BUILD_HOME + "/tools/Modules/";
-  public static final String DEFAULT_MODULE_EXTRACTION_DIR = "/tmp/cargo_modules/";
+  public static final String DEFAULT_MODULE_EXTRACTION_DIR = TMP_DIR + "/cargo_modules/";
 
   /**
    * Represents the type of connection used in this installation
@@ -137,7 +138,8 @@ public abstract class ContainerInstall {
     logger.info("Installing container from URL " + downloadURL);
 
     // Optional step to install the container from a URL pointing to its distribution
-    Installer installer = new ZipURLInstaller(new URL(downloadURL), "/tmp/downloads", installDir);
+    Installer installer =
+        new ZipURLInstaller(new URL(downloadURL), TMP_DIR + "/downloads", installDir);
     installer.install();
 
     // Set install home

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message