Repository: flink Updated Branches: refs/heads/master 07a7b73be -> 4d8cbec4f
[FLINK-4009][tests] fix Scala Shell external library tests for IntelliJ Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4d8cbec4 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4d8cbec4 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4d8cbec4 Branch: refs/heads/master Commit: 4d8cbec4ffca033f5602a53205d65e535ffc5f97 Parents: 07a7b73 Author: Maximilian Michels <[email protected]> Authored: Fri Jun 17 13:42:38 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Fri Jun 17 13:43:21 2016 +0200 ---------------------------------------------------------------------- .../src/test/resources/log4j-test.properties | 3 +-- .../flink/api/scala/ScalaShellITCase.scala | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/4d8cbec4/flink-scala-shell/src/test/resources/log4j-test.properties ---------------------------------------------------------------------- diff --git a/flink-scala-shell/src/test/resources/log4j-test.properties b/flink-scala-shell/src/test/resources/log4j-test.properties index 9912b19..0fddd37 100644 --- a/flink-scala-shell/src/test/resources/log4j-test.properties +++ b/flink-scala-shell/src/test/resources/log4j-test.properties @@ -17,8 +17,7 @@ ################################################################################ -# Convenience file for local debugging of the JobManager/TaskManager. -log4j.rootLogger=OFF, console +log4j.rootLogger=ERROR, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n http://git-wip-us.apache.org/repos/asf/flink/blob/4d8cbec4/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala ---------------------------------------------------------------------- diff --git a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala index 6effce7..5721a61 100644 --- a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala +++ b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala @@ -173,7 +173,10 @@ class ScalaShellITCase extends TestLogger { // find jar file that contains the ml code var externalJar = "" - val folder = new File("../../flink-libraries/flink-ml/target/") + val folder = findLibraryFolder( + "../flink-libraries/flink-ml/target/", + "../../flink-libraries/flink-ml/target/") + val listOfFiles = folder.listFiles() for (i <- listOfFiles.indices) { @@ -208,7 +211,10 @@ class ScalaShellITCase extends TestLogger { // find jar file that contains the ml code var externalJar = "" - val folder = new File("../../flink-libraries/flink-ml/target/") + val folder = findLibraryFolder( + "../flink-libraries/flink-ml/target/", + "../../flink-libraries/flink-ml/target/") + val listOfFiles = folder.listFiles() for (i <- listOfFiles.indices) { @@ -406,4 +412,14 @@ object ScalaShellITCase { out.toString + stdout } + + def findLibraryFolder(paths: String*): File = { + for (path <- paths) { + val folder = new File(path) + if (folder.exists()) { + return folder + } + } + throw new RuntimeException("Library folder not found in any of the supplied paths!") + } }
