You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/07/21 21:11:05 UTC
[26/26] flink git commit: [FLINK-2198] [tests] Under Windows,
skip tests that use setWritable
[FLINK-2198] [tests] Under Windows, skip tests that use setWritable
This closes #919
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/50344d70
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/50344d70
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/50344d70
Branch: refs/heads/master
Commit: 50344d70deb6348923f42a1ddaaf0e570708bc71
Parents: efafaee
Author: Gabor Gevay <gg...@gmail.com>
Authored: Fri Jul 17 13:18:09 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Jul 21 17:58:16 2015 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/blob/BlobServerDeleteTest.java | 4 ++++
.../java/org/apache/flink/runtime/blob/BlobServerPutTest.java | 6 ++++++
.../test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java | 4 ++++
.../execution/librarycache/BlobLibraryCacheManagerTest.java | 4 ++++
.../apache/flink/runtime/jobmanager/JobManagerStartupTest.java | 4 ++++
5 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/50344d70/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerDeleteTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerDeleteTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerDeleteTest.java
index 8613b4e..cef9ad3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerDeleteTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerDeleteTest.java
@@ -20,6 +20,7 @@ package org.apache.flink.runtime.blob;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.api.common.JobID;
+import org.apache.flink.util.OperatingSystem;
import org.junit.Test;
import java.io.File;
@@ -30,6 +31,7 @@ import java.util.Random;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
/**
* Tests how DELETE requests behave.
@@ -267,6 +269,8 @@ public class BlobServerDeleteTest {
@Test
public void testDeleteFails() {
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
BlobServer server = null;
BlobClient client = null;
http://git-wip-us.apache.org/repos/asf/flink/blob/50344d70/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerPutTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerPutTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerPutTest.java
index c98e575..dc18787 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerPutTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerPutTest.java
@@ -20,6 +20,7 @@ package org.apache.flink.runtime.blob;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.api.common.JobID;
+import org.apache.flink.util.OperatingSystem;
import org.junit.Test;
import java.io.ByteArrayInputStream;
@@ -30,6 +31,7 @@ import java.net.InetSocketAddress;
import java.util.Random;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
/**
* Tests for successful and failing PUT operations against the BLOB server,
@@ -209,6 +211,8 @@ public class BlobServerPutTest {
@Test
public void testPutBufferFails() {
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
BlobServer server = null;
BlobClient client = null;
@@ -271,6 +275,8 @@ public class BlobServerPutTest {
@Test
public void testPutNamedBufferFails() {
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
BlobServer server = null;
BlobClient client = null;
http://git-wip-us.apache.org/repos/asf/flink/blob/50344d70/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java
index 7fd42c8..63ec338 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobUtilsTest.java
@@ -19,10 +19,12 @@
package org.apache.flink.runtime.blob;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.mock;
import com.google.common.io.Files;
+import org.apache.flink.util.OperatingSystem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,6 +42,8 @@ public class BlobUtilsTest {
// Prepare test directory
blobUtilsTestDirectory = Files.createTempDir();
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
assertTrue(blobUtilsTestDirectory.setExecutable(true, false));
assertTrue(blobUtilsTestDirectory.setReadable(true, false));
assertTrue(blobUtilsTestDirectory.setWritable(false, false));
http://git-wip-us.apache.org/repos/asf/flink/blob/50344d70/flink-runtime/src/test/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManagerTest.java
index d024135..4e814f5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManagerTest.java
@@ -27,9 +27,11 @@ import org.apache.flink.runtime.blob.BlobKey;
import org.apache.flink.runtime.blob.BlobServer;
import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
import org.apache.flink.api.common.JobID;
+import org.apache.flink.util.OperatingSystem;
import org.junit.Test;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.io.IOException;
@@ -131,6 +133,8 @@ public class BlobLibraryCacheManagerTest {
@Test
public void testRegisterAndDownload() {
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
BlobServer server = null;
BlobCache cache = null;
File cacheDir = null;
http://git-wip-us.apache.org/repos/asf/flink/blob/50344d70/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
index e7665a6..6125479 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
@@ -19,6 +19,7 @@
package org.apache.flink.runtime.jobmanager;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.net.InetAddress;
@@ -31,6 +32,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.StreamingMode;
import org.apache.flink.runtime.net.NetUtils;
+import org.apache.flink.util.OperatingSystem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,6 +52,8 @@ public class JobManagerStartupTest {
// Prepare test directory
blobStorageDirectory = Files.createTempDir();
+ assumeTrue(!OperatingSystem.isWindows()); //setWritable doesn't work on Windows.
+
assertTrue(blobStorageDirectory.setExecutable(true, false));
assertTrue(blobStorageDirectory.setReadable(true, false));
assertTrue(blobStorageDirectory.setWritable(false, false));