From 3800e25d6e491a0059054166cb78e0455ecc20f7 Mon Sep 17 00:00:00 2001
From: Wangda Tan <wangda@apache.org>
Date: Wed, 22 Jul 2015 11:59:31 -0700
Subject: [PATCH] YARN-3956. Fix TestNodeManagerHardwareUtils fails on Mac
 (Varun Vasudev via wangda)

(cherry picked from commit 06e5dd2c84c49460884757b56980b1b9c58af996)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
---
 hadoop-yarn-project/CHANGES.txt                              | 2 ++
 .../nodemanager/util/TestNodeManagerHardwareUtils.java       | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8b362921ff1..3f093bd9df4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -604,6 +604,8 @@ Release 2.8.0 - UNRELEASED
     YARN-3932. SchedulerApplicationAttempt#getResourceUsageReport and UserInfo 
     should based on total-used-resources. (Bibin A Chundatt via wangda)
 
+    YARN-3956. Fix TestNodeManagerHardwareUtils fails on Mac (Varun Vasudev via wangda)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestNodeManagerHardwareUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestNodeManagerHardwareUtils.java
index 5bf8cb7e67f..84a045dbb25 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestNodeManagerHardwareUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/util/TestNodeManagerHardwareUtils.java
@@ -30,6 +30,11 @@ import org.mockito.Mockito;
 public class TestNodeManagerHardwareUtils {
 
   static class TestResourceCalculatorPlugin extends ResourceCalculatorPlugin {
+
+    TestResourceCalculatorPlugin() {
+      super(null);
+    }
+
     @Override
     public long getVirtualMemorySize() {
       return 0;