Merge pull request #121 from palantir/feature/allow-circle-aware-log-…

…directory-string Add string version of circleAwareLogDirectory.
palantir · Oct 18, 2016 · e4a0335 · e4a0335
2 parents 34ee34a + 24fa4ca
commit e4a0335
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java b/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java
@@ -21,8 +21,12 @@ private LogDirectory() {}
      * @param testClass the JUnit test class whose name will appear on the log folder
      */
     public static String circleAwareLogDirectory(Class<?> testClass) {
+        return circleAwareLogDirectory(testClass.getSimpleName());
+    }
+
+    public static String circleAwareLogDirectory(String logDirectoryName) {
         String artifactRoot = Optional.ofNullable(System.getenv("CIRCLE_ARTIFACTS")).orElse("build");
-        return artifactRoot + "/dockerLogs/" + testClass.getSimpleName();
+        return artifactRoot + "/dockerLogs/" + logDirectoryName;
     }
 
     /**

diff --git a/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java b/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java
@@ -37,5 +37,13 @@ public void circleAwareLogDirectory_should_use_circle_environment_variable_if_av
         assertThat(directory, is("/tmp/circle-artifacts.g4DjuuD/dockerLogs/SomeTestClass"));
     }
 
+    @Test
+    public void circleAwareLogDirectory_should_append_logDirectoryName_to_path() {
+        variablesRule.set("CIRCLE_ARTIFACTS", "/tmp/circle-artifacts.123456");
+
+        String directory = LogDirectory.circleAwareLogDirectory("some-path");
+        assertThat(directory, is("/tmp/circle-artifacts.123456/dockerLogs/some-path"));
+    }
+
     private static class SomeTestClass {}
 }