You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/11 09:12:12 UTC
flink git commit: [FLINK-7111] [scala-shell] Disable external jar test
Repository: flink
Updated Branches:
refs/heads/master 74adb8474 -> d0e52954b
[FLINK-7111] [scala-shell] Disable external jar test
This closes #4288.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d0e52954
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d0e52954
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d0e52954
Branch: refs/heads/master
Commit: d0e52954b035cd4e8cd25962500b3ebb57561f39
Parents: 74adb84
Author: zentol <ch...@apache.org>
Authored: Sat Jul 8 08:44:05 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue Jul 11 11:11:52 2017 +0200
----------------------------------------------------------------------
flink-scala-shell/pom.xml | 55 --------------------
.../flink/api/scala/ScalaShellITCase.scala | 14 +++--
2 files changed, 11 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d0e52954/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index e312699..6f490e4 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -242,61 +242,6 @@ under the License.
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version><!--$NO-MVN-MAN-VER$-->
- <executions>
- <execution>
- <id>create-library-loading-jar</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <!--<archive>-->
- <!--<manifest>-->
- <!--<mainClass>org.apache.flink.test.classloading.jar.KMeansForTest</mainClass>-->
- <!--</manifest>-->
- <!--</archive>-->
- <finalName>customjar</finalName>
- <attach>false</attach>
- <descriptors>
- <descriptor>src/test/assembly/test-scalashell-customjar-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- <!--Remove the the classes in the jar package from the test-classes directory since they
- musn't be in the classpath when running ScalaShellITCase to actually test loading
- of external jars.-->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version><!--$NO-MVN-MAN-VER$-->
- <executions>
- <execution>
- <id>remove-classloading-test-dependencies</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <excludeDefaultDirectories>true</excludeDefaultDirectories>
- <filesets>
- <fileset>
- <directory>${project.build.testOutputDirectory}</directory>
- <includes>
- <include>**/jar/*.class</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/d0e52954/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 ce08304..b4ccfaa 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
@@ -26,7 +26,7 @@ import org.apache.flink.runtime.minicluster.StandaloneMiniCluster
import org.apache.flink.configuration.{ConfigConstants, Configuration, GlobalConfiguration}
import org.apache.flink.test.util.TestBaseUtils
import org.apache.flink.util.TestLogger
-import org.junit.{AfterClass, Assert, BeforeClass, Test}
+import org.junit.{AfterClass, Assert, BeforeClass, Ignore, Test}
import scala.concurrent.{Await, Future}
import scala.concurrent.duration.FiniteDuration
@@ -164,7 +164,11 @@ class ScalaShellITCase extends TestLogger {
Assert.assertTrue(output.contains("WC(world,10)"))
}
- /** Submit external library */
+ /**
+ * Submit external library.
+ * Disabled due to FLINK-7111.
+ */
+ @Ignore
@Test
def testSubmissionOfExternalLibraryBatch: Unit = {
val input =
@@ -184,7 +188,11 @@ class ScalaShellITCase extends TestLogger {
Assert.assertTrue(output.contains("\nHELLO 42"))
}
- /** Submit external library */
+ /**
+ * Submit external library.
+ * Disabled due to FLINK-7111.
+ */
+ @Ignore
@Test
def testSubmissionOfExternalLibraryStream: Unit = {
val input =