You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/01/11 11:18:47 UTC
[2/4] flink git commit: [FLINK-8404] [tests] Mark Flip-6 tests with
Flip6 category annotation
[FLINK-8404] [tests] Mark Flip-6 tests with Flip6 category annotation
Marks all existing Flip-6 test cases with the Flip6 category annotation. That
way they are only run if the Flip-6 test profile is active.
This closes #5278.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8353123b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8353123b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8353123b
Branch: refs/heads/master
Commit: 8353123b39ea49cc5b3bd9d324972bf6ae02f2a6
Parents: 6c078c0
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed Jan 10 14:13:38 2018 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Thu Jan 11 12:12:50 2018 +0100
----------------------------------------------------------------------
.../flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java | 3 +++
.../flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java | 3 +++
.../flink/runtime/jobmaster/slotpool/DualKeyMapTest.java | 3 +++
.../flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java | 3 +++
.../jobmaster/slotpool/SlotPoolSchedulingTestBase.java | 3 +++
.../apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java | 3 +++
.../runtime/jobmaster/slotpool/SlotSharingManagerTest.java | 3 +++
.../flink/runtime/resourcemanager/ResourceManagerTest.java | 3 +++
.../org/apache/flink/runtime/rest/RestServerEndpointTest.java | 3 +++
.../rest/handler/job/metrics/AbstractMetricsHandlerTest.java | 3 +++
.../rest/handler/job/metrics/MetricsHandlerTestBase.java | 6 ++++--
.../rest/messages/job/metrics/AbstractMetricsHeadersTest.java | 3 +++
.../messages/job/metrics/JobManagerMetricsHeadersTest.java | 7 ++++++-
.../rest/messages/job/metrics/JobMetricsHeadersTest.java | 6 +++++-
.../messages/job/metrics/JobVertexMetricsHeadersTest.java | 6 +++++-
.../rest/messages/job/metrics/MetricsFilterParameterTest.java | 3 +++
.../rest/messages/job/metrics/SubtaskMetricsHeadersTest.java | 6 +++++-
.../messages/job/metrics/TaskManagerMetricsHeadersTest.java | 6 +++++-
.../messages/taskmanager/TaskManagerIdPathParameterTest.java | 6 +++++-
.../runtime/taskexecutor/NetworkBufferCalculationTest.java | 3 +++
.../runtime/taskexecutor/TestingTaskExecutorGateway.java | 4 ++++
21 files changed, 78 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
index 4dee924..f97ff4f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
@@ -25,15 +25,18 @@ import org.apache.flink.runtime.executiongraph.utils.SimpleAckingTaskManagerGate
import org.apache.flink.runtime.jobmaster.SlotRequestId;
import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@Category(Flip6.class)
public class AllocatedSlotsTest extends TestLogger {
@Test
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
index 4835c57..2d18c65 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
@@ -24,9 +24,11 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.jobmanager.slots.SlotAndLocality;
import org.apache.flink.runtime.jobmanager.slots.TaskManagerGateway;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -35,6 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@Category(Flip6.class)
public class AvailableSlotsTest extends TestLogger {
static final ResourceProfile DEFAULT_TESTING_PROFILE = new ResourceProfile(1.0, 512);
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
index 1500d24..4504b5a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
@@ -19,10 +19,12 @@
package org.apache.flink.runtime.jobmaster.slotpool;
import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.hamcrest.Matchers;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.HashSet;
import java.util.Random;
@@ -34,6 +36,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
/**
* Tests for the {@link DualKeyMap}.
*/
+@Category(Flip6.class)
public class DualKeyMapTest extends TestLogger {
@Test
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
index 2d862c5..e60a3d6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
@@ -45,6 +45,7 @@ import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.util.clock.Clock;
import org.apache.flink.runtime.util.clock.SystemClock;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.TestLogger;
@@ -54,6 +55,7 @@ import akka.pattern.AskTimeoutException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import javax.annotation.Nullable;
@@ -71,6 +73,7 @@ import static org.junit.Assert.fail;
/**
* Tests for the SlotPool using a proper RPC setup.
*/
+@Category(Flip6.class)
public class SlotPoolRpcTest extends TestLogger {
private static RpcService rpcService;
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
index 31be1ae..4cd7782 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
@@ -24,12 +24,14 @@ import org.apache.flink.runtime.resourcemanager.utils.TestingResourceManagerGate
import org.apache.flink.runtime.rpc.RpcUtils;
import org.apache.flink.runtime.rpc.TestingRpcService;
import org.apache.flink.runtime.testingUtils.TestingUtils;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -37,6 +39,7 @@ import java.util.concurrent.TimeoutException;
/**
* Test base for {@link SlotPool} related scheduling test cases.
*/
+@Category(Flip6.class)
public class SlotPoolSchedulingTestBase extends TestLogger {
private static final JobID jobId = new JobID();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
index 6a8ef0a..ef79be1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
@@ -40,6 +40,7 @@ import org.apache.flink.runtime.rpc.TestingRpcService;
import org.apache.flink.runtime.taskexecutor.slot.SlotOffer;
import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.TestLogger;
@@ -48,6 +49,7 @@ import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,6 +72,7 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(Flip6.class)
public class SlotPoolTest extends TestLogger {
private static final Logger LOG = LoggerFactory.getLogger(SlotPoolTest.class);
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
index c355f38..c18b3b3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
@@ -28,11 +28,13 @@ import org.apache.flink.runtime.jobmaster.LogicalSlot;
import org.apache.flink.runtime.jobmaster.SlotContext;
import org.apache.flink.runtime.jobmaster.SlotRequestId;
import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.AbstractID;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Collections;
import java.util.Objects;
@@ -49,6 +51,7 @@ import static org.junit.Assert.assertTrue;
/**
* Test cases for the {@link SlotSharingManager}.
*/
+@Category(Flip6.class)
public class SlotSharingManagerTest extends TestLogger {
private static final SlotSharingGroupId SLOT_SHARING_GROUP_ID = new SlotSharingGroupId();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java
index 87cb4a9..8f35b13 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java
@@ -35,16 +35,19 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorGateway;
import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGateway;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.util.TestingFatalErrorHandler;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+@Category(Flip6.class)
public class ResourceManagerTest extends TestLogger {
private TestingRpcService rpcService;
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointTest.java
index 3cb4a55..866dfbf 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointTest.java
@@ -18,9 +18,11 @@
package org.apache.flink.runtime.rest;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,6 +33,7 @@ import static org.junit.Assert.assertEquals;
/**
* Test cases for the {@link RestServerEndpoint}.
*/
+@Category(Flip6.class)
public class RestServerEndpointTest extends TestLogger {
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
index 241bbba..80a8759 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
@@ -35,10 +35,12 @@ import org.apache.flink.runtime.rest.messages.job.metrics.Metric;
import org.apache.flink.runtime.rest.messages.job.metrics.MetricCollectionResponseBody;
import org.apache.flink.runtime.rest.messages.job.metrics.MetricsFilterParameter;
import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -59,6 +61,7 @@ import static org.mockito.Mockito.when;
/**
* Tests for {@link AbstractMetricsHandler}.
*/
+@Category(Flip6.class)
public class AbstractMetricsHandlerTest extends TestLogger {
private static final String TEST_METRIC_NAME = "test_counter";
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/MetricsHandlerTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/MetricsHandlerTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/MetricsHandlerTestBase.java
index 05a1163..92ee185 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/MetricsHandlerTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/MetricsHandlerTestBase.java
@@ -29,10 +29,12 @@ import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
import org.apache.flink.runtime.rest.messages.job.metrics.Metric;
import org.apache.flink.runtime.rest.messages.job.metrics.MetricCollectionResponseBody;
import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -49,8 +51,8 @@ import static org.mockito.Mockito.when;
/**
* Unit test base class for subclasses of {@link AbstractMetricsHandler}.
*/
-public abstract class MetricsHandlerTestBase<T extends
- AbstractMetricsHandler> extends TestLogger {
+@Category(Flip6.class)
+public abstract class MetricsHandlerTestBase<T extends AbstractMetricsHandler> extends TestLogger {
private static final String TEST_METRIC_NAME = "test_counter";
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/AbstractMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/AbstractMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/AbstractMetricsHeadersTest.java
index 51a6ff8..5228e0e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/AbstractMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/AbstractMetricsHeadersTest.java
@@ -21,12 +21,14 @@ package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.HttpMethodWrapper;
import org.apache.flink.runtime.rest.messages.EmptyMessageParameters;
import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
@@ -34,6 +36,7 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link AbstractMetricsHeaders}.
*/
+@Category(Flip6.class)
public class AbstractMetricsHeadersTest extends TestLogger {
private AbstractMetricsHeaders<EmptyMessageParameters> metricsHandlerHeaders;
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobManagerMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobManagerMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobManagerMetricsHeadersTest.java
index f6c9171..e87d3de 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobManagerMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobManagerMetricsHeadersTest.java
@@ -18,7 +18,11 @@
package org.apache.flink.runtime.rest.messages.job.metrics;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
+
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
@@ -27,7 +31,8 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link JobManagerMetricsHeaders}.
*/
-public class JobManagerMetricsHeadersTest {
+@Category(Flip6.class)
+public class JobManagerMetricsHeadersTest extends TestLogger {
private final JobManagerMetricsHeaders jobManagerMetricsHeaders =
JobManagerMetricsHeaders.getInstance();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobMetricsHeadersTest.java
index a623eba..515c7c4 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobMetricsHeadersTest.java
@@ -19,8 +19,11 @@
package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
@@ -29,7 +32,8 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link JobMetricsHeaders}.
*/
-public class JobMetricsHeadersTest {
+@Category(Flip6.class)
+public class JobMetricsHeadersTest extends TestLogger {
private final JobMetricsHeaders jobMetricsHeaders = JobMetricsHeaders.getInstance();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobVertexMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobVertexMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobVertexMetricsHeadersTest.java
index fd8283a..f20abdb 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobVertexMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/JobVertexMetricsHeadersTest.java
@@ -20,8 +20,11 @@ package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
import org.apache.flink.runtime.rest.messages.JobVertexIdPathParameter;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
@@ -30,7 +33,8 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link JobVertexMetricsHeaders}.
*/
-public class JobVertexMetricsHeadersTest {
+@Category(Flip6.class)
+public class JobVertexMetricsHeadersTest extends TestLogger {
private final JobVertexMetricsHeaders jobVertexMetricsHeaders = JobVertexMetricsHeaders
.getInstance();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
index 2756a65..7e1812f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/MetricsFilterParameterTest.java
@@ -18,10 +18,12 @@
package org.apache.flink.runtime.rest.messages.job.metrics;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.TestLogger;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertFalse;
@@ -30,6 +32,7 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link MetricsFilterParameter}.
*/
+@Category(Flip6.class)
public class MetricsFilterParameterTest extends TestLogger {
private MetricsFilterParameter metricsFilterParameter;
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/SubtaskMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/SubtaskMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/SubtaskMetricsHeadersTest.java
index 345ad74..0f82465 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/SubtaskMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/SubtaskMetricsHeadersTest.java
@@ -21,8 +21,11 @@ package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
import org.apache.flink.runtime.rest.messages.JobVertexIdPathParameter;
import org.apache.flink.runtime.rest.messages.SubtaskIndexPathParameter;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
@@ -31,7 +34,8 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link SubtaskMetricsHeaders}.
*/
-public class SubtaskMetricsHeadersTest {
+@Category(Flip6.class)
+public class SubtaskMetricsHeadersTest extends TestLogger {
private final SubtaskMetricsHeaders subtaskMetricsHeaders = SubtaskMetricsHeaders.getInstance();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/TaskManagerMetricsHeadersTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/TaskManagerMetricsHeadersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/TaskManagerMetricsHeadersTest.java
index ee2848a..477e9f8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/TaskManagerMetricsHeadersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/job/metrics/TaskManagerMetricsHeadersTest.java
@@ -19,8 +19,11 @@
package org.apache.flink.runtime.rest.messages.job.metrics;
import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerIdPathParameter;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
@@ -29,7 +32,8 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link TaskManagerMetricsHeaders}.
*/
-public class TaskManagerMetricsHeadersTest {
+@Category(Flip6.class)
+public class TaskManagerMetricsHeadersTest extends TestLogger {
private final TaskManagerMetricsHeaders taskManagerMetricsHeaders =
TaskManagerMetricsHeaders.getInstance();
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerIdPathParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerIdPathParameterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerIdPathParameterTest.java
index f9c234f..379fe4c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerIdPathParameterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/messages/taskmanager/TaskManagerIdPathParameterTest.java
@@ -19,9 +19,12 @@
package org.apache.flink.runtime.rest.messages.taskmanager;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
+import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.util.TestLogger;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
@@ -30,7 +33,8 @@ import static org.junit.Assert.assertTrue;
/**
* Tests for {@link TaskManagerIdPathParameter}.
*/
-public class TaskManagerIdPathParameterTest {
+@Category(Flip6.class)
+public class TaskManagerIdPathParameterTest extends TestLogger {
private TaskManagerIdPathParameter taskManagerIdPathParameter;
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/NetworkBufferCalculationTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/NetworkBufferCalculationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/NetworkBufferCalculationTest.java
index eb879c4..6c145e8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/NetworkBufferCalculationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/NetworkBufferCalculationTest.java
@@ -22,9 +22,11 @@ import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.core.memory.MemoryType;
import org.apache.flink.runtime.taskmanager.NetworkEnvironmentConfiguration;
import org.apache.flink.runtime.util.EnvironmentInformation;
+import org.apache.flink.testutils.category.OldAndFlip6;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -45,6 +47,7 @@ import static org.powermock.api.mockito.PowerMockito.when;
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest(EnvironmentInformation.class)
+@Category(OldAndFlip6.class)
public class NetworkBufferCalculationTest extends TestLogger {
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/8353123b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TestingTaskExecutorGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TestingTaskExecutorGateway.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TestingTaskExecutorGateway.java
index aa6c872..4c79ec4 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TestingTaskExecutorGateway.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TestingTaskExecutorGateway.java
@@ -31,14 +31,18 @@ import org.apache.flink.runtime.executiongraph.PartitionInfo;
import org.apache.flink.runtime.jobmaster.JobMasterId;
import org.apache.flink.runtime.messages.Acknowledge;
import org.apache.flink.runtime.resourcemanager.ResourceManagerId;
+import org.apache.flink.testutils.category.Flip6;
import org.apache.flink.util.Preconditions;
+import org.junit.experimental.categories.Category;
+
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
/**
* Simple {@link TaskExecutorGateway} implementation for testing purposes.
*/
+@Category(Flip6.class)
public class TestingTaskExecutorGateway implements TaskExecutorGateway {
private final String address;