From 656453bad71f22e509f5bfc7843e359e3534216e Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Wed, 27 Feb 2019 22:48:32 +0530 Subject: [PATCH] YARN-9324 --- .../capacity/TestSchedulingRequestContainerAllocation.java | 10 ++++++---- .../TestSchedulingRequestContainerAllocationAsync.java | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocation.java index b1bb515..2c1476e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocation.java @@ -56,6 +56,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -82,10 +83,11 @@ @Parameters - public static Object[] placementConstarintHandlers() { - return new Object[] { - YarnConfiguration.PROCESSOR_RM_PLACEMENT_CONSTRAINTS_HANDLER, - YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER}; + public static Collection placementConstarintHandlers() { + Object[][] params = new Object[][] { + {YarnConfiguration.PROCESSOR_RM_PLACEMENT_CONSTRAINTS_HANDLER}, + {YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER} }; + return Arrays.asList(params); } public TestSchedulingRequestContainerAllocation( diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocationAsync.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocationAsync.java index 95e0a72..9ce03c9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocationAsync.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestSchedulingRequestContainerAllocationAsync.java @@ -40,6 +40,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.Collection; import java.util.List; /** @@ -55,10 +57,11 @@ RMNodeLabelsManager mgr; @Parameters - public static Object[] placementConstarintHandlers() { - return new Object[] { - YarnConfiguration.PROCESSOR_RM_PLACEMENT_CONSTRAINTS_HANDLER, - YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER}; + public static Collection placementConstarintHandlers() { + Object[][] params = new Object[][] { + {YarnConfiguration.PROCESSOR_RM_PLACEMENT_CONSTRAINTS_HANDLER}, + {YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER} }; + return Arrays.asList(params); } public TestSchedulingRequestContainerAllocationAsync( -- 2.7.4 (Apple Git-66)