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/05/12 06:23:58 UTC
[1/3] flink git commit: [FLINK-6548] Fix
AvroOutputFormatTest#testCompression on Windows
Repository: flink
Updated Branches:
refs/heads/release-1.3 d0f89d9b2 -> f3ce0885f
[FLINK-6548] Fix AvroOutputFormatTest#testCompression on Windows
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c743f14e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c743f14e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c743f14e
Branch: refs/heads/release-1.3
Commit: c743f14ecb08f39a3f7278340a89d1a035749aa7
Parents: d0f89d9
Author: zentol <ch...@apache.org>
Authored: Thu May 11 16:39:12 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu May 11 21:54:16 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/api/java/io/AvroOutputFormatTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c743f14e/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroOutputFormatTest.java b/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroOutputFormatTest.java
index 4d6c6b7..f843d3b 100644
--- a/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroOutputFormatTest.java
+++ b/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroOutputFormatTest.java
@@ -28,8 +28,6 @@ import java.io.File;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import org.apache.avro.Schema;
import org.apache.flink.api.io.avro.example.User;
@@ -135,12 +133,13 @@ public class AvroOutputFormatTest {
assertTrue(fileSize(outputPath) > fileSize(compressedOutputPath));
// cleanup
- Files.delete(Paths.get(outputPath.getPath()));
- Files.delete(Paths.get(compressedOutputPath.getPath()));
+ FileSystem fs = FileSystem.getLocalFileSystem();
+ fs.delete(outputPath, false);
+ fs.delete(compressedOutputPath, false);
}
private long fileSize(Path path) throws IOException {
- return Files.size(Paths.get(path.getPath()));
+ return path.getFileSystem().getFileStatus(path).getLen();
}
private void output(final AvroOutputFormat<User> outputFormat) throws IOException {
[3/3] flink git commit: [FLINK-6561] Disable glob test on Windows
Posted by ch...@apache.org.
[FLINK-6561] Disable glob test on Windows
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f3ce0885
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f3ce0885
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f3ce0885
Branch: refs/heads/release-1.3
Commit: f3ce0885fc09b3b6853e8f662a15ca3a3c4b26e4
Parents: f0ff504
Author: zentol <ch...@apache.org>
Authored: Thu May 11 21:24:02 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu May 11 21:54:33 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/api/common/io/GlobFilePathFilterTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f3ce0885/flink-core/src/test/java/org/apache/flink/api/common/io/GlobFilePathFilterTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/GlobFilePathFilterTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/GlobFilePathFilterTest.java
index c9f8da4..bcdb5c3 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/GlobFilePathFilterTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/GlobFilePathFilterTest.java
@@ -19,6 +19,8 @@ package org.apache.flink.api.common.io;
import org.apache.flink.core.fs.Path;
import org.apache.flink.core.testutils.CommonTestUtils;
+import org.apache.flink.util.OperatingSystem;
+import org.junit.Assume;
import org.junit.Test;
import java.io.IOException;
@@ -110,6 +112,8 @@ public class GlobFilePathFilterTest {
@Test
public void testExcludeFilenameWithStart() {
+ Assume.assumeTrue("Windows does not allow asterisks in file names.", !OperatingSystem.isWindows());
+
GlobFilePathFilter matcher = new GlobFilePathFilter(
Collections.singletonList("**"),
Collections.singletonList("\\*"));
[2/3] flink git commit: [FLINK-6558] Disable yarn tests on Windows
Posted by ch...@apache.org.
[FLINK-6558] Disable yarn tests on Windows
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f0ff5046
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f0ff5046
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f0ff5046
Branch: refs/heads/release-1.3
Commit: f0ff5046901c507d34675375c85a1f17e6d4ecdb
Parents: c743f14
Author: zentol <ch...@apache.org>
Authored: Thu May 11 16:55:11 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu May 11 21:54:25 2017 +0200
----------------------------------------------------------------------
.../apache/flink/yarn/YarnApplicationMasterRunnerTest.java | 8 ++++++++
.../highavailability/YarnIntraNonHaMasterServicesTest.java | 4 ++++
.../YarnPreConfiguredMasterHaServicesTest.java | 4 ++++
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f0ff5046/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationMasterRunnerTest.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationMasterRunnerTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationMasterRunnerTest.java
index f874896..4884dd0 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationMasterRunnerTest.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationMasterRunnerTest.java
@@ -21,8 +21,11 @@ package org.apache.flink.yarn;
import com.google.common.collect.ImmutableMap;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
+import org.apache.flink.util.OperatingSystem;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.junit.Assume;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -49,6 +52,11 @@ public class YarnApplicationMasterRunnerTest {
@Rule
public TemporaryFolder folder = new TemporaryFolder();
+ @BeforeClass
+ public static void checkOS() {
+ Assume.assumeTrue(!OperatingSystem.isWindows());
+ }
+
@Test
public void testCreateTaskExecutorContext() throws Exception {
File root = folder.getRoot();
http://git-wip-us.apache.org/repos/asf/flink/blob/f0ff5046/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnIntraNonHaMasterServicesTest.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnIntraNonHaMasterServicesTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnIntraNonHaMasterServicesTest.java
index 64c22d2..b4d2ba8 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnIntraNonHaMasterServicesTest.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnIntraNonHaMasterServicesTest.java
@@ -24,12 +24,14 @@ import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalListener;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
+import org.apache.flink.util.OperatingSystem;
import org.apache.flink.util.StringUtils;
import org.apache.flink.util.TestLogger;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.junit.AfterClass;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -70,6 +72,8 @@ public class YarnIntraNonHaMasterServicesTest extends TestLogger {
@BeforeClass
public static void createHDFS() throws Exception {
+ Assume.assumeTrue(!OperatingSystem.isWindows());
+
final File tempDir = TEMP_DIR.newFolder();
org.apache.hadoop.conf.Configuration hdConf = new org.apache.hadoop.conf.Configuration();
http://git-wip-us.apache.org/repos/asf/flink/blob/f0ff5046/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnPreConfiguredMasterHaServicesTest.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnPreConfiguredMasterHaServicesTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnPreConfiguredMasterHaServicesTest.java
index 83ec37d..07c952a 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnPreConfiguredMasterHaServicesTest.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/highavailability/YarnPreConfiguredMasterHaServicesTest.java
@@ -24,12 +24,14 @@ import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.core.fs.FileSystem;
import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
+import org.apache.flink.util.OperatingSystem;
import org.apache.flink.util.TestLogger;
import org.apache.flink.yarn.configuration.YarnConfigOptions;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.junit.AfterClass;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -59,6 +61,8 @@ public class YarnPreConfiguredMasterHaServicesTest extends TestLogger {
@BeforeClass
public static void createHDFS() throws Exception {
+ Assume.assumeTrue(!OperatingSystem.isWindows());
+
final File tempDir = TEMP_DIR.newFolder();
org.apache.hadoop.conf.Configuration hdConf = new org.apache.hadoop.conf.Configuration();