From fecd900b1030d0850ff8698ce85ee720c8cae613 Mon Sep 17 00:00:00 2001 From: zentol Date: Fri, 29 Jul 2016 12:15:54 +0200 Subject: [PATCH 1/2] [FLINK-4277] Fix TaskManagerConfigurationTest#testDefaultFsParameterLoading --- .../runtime/taskmanager/TaskManagerConfigurationTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java index 335f78881af02..608e09b53081f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java @@ -110,7 +110,7 @@ public void testActorSystemPortConfig() { @Test public void testDefaultFsParameterLoading() { final File tmpDir = getTmpDir(); - final File confFile = new File(tmpDir, UUID.randomUUID().toString() + ".yaml"); + final File confFile = new File(tmpDir, "flink-conf.yaml"); try { final URI defaultFS = new URI("otherFS", null, "localhost", 1234, null, null, null); @@ -119,9 +119,7 @@ public void testDefaultFsParameterLoading() { pw1.println("fs.default-scheme: "+ defaultFS); pw1.close(); - String filepath = confFile.getAbsolutePath(); - - String[] args = new String[]{"--configDir:"+filepath}; + String[] args = new String[]{"--configDir:" + tmpDir}; TaskManager.parseArgsAndLoadConfig(args); Field f = FileSystem.class.getDeclaredField("defaultScheme"); From fcd0a589daa21c98ec85d88c8356739c67694b39 Mon Sep 17 00:00:00 2001 From: zentol Date: Fri, 29 Jul 2016 14:12:17 +0200 Subject: [PATCH 2/2] address comments --- .../runtime/taskmanager/TaskManagerConfigurationTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java index 608e09b53081f..acfbbfdd3490a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerConfigurationTest.java @@ -20,6 +20,7 @@ import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.configuration.IllegalConfigurationException; import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.testutils.CommonTestUtils; @@ -110,7 +111,7 @@ public void testActorSystemPortConfig() { @Test public void testDefaultFsParameterLoading() { final File tmpDir = getTmpDir(); - final File confFile = new File(tmpDir, "flink-conf.yaml"); + final File confFile = new File(tmpDir, GlobalConfiguration.FLINK_CONF_FILENAME); try { final URI defaultFS = new URI("otherFS", null, "localhost", 1234, null, null, null); @@ -127,10 +128,8 @@ public void testDefaultFsParameterLoading() { URI scheme = (URI) f.get(null); assertEquals("Default Filesystem Scheme not configured.", scheme, defaultFS); - } catch (FileNotFoundException e) { - fail(e.getMessage()); } catch (Exception e) { - e.printStackTrace(); + fail(e.getMessage()); } finally { confFile.delete(); tmpDir.delete();