HDDS-861. SCMNodeManager unit tests are broken. Contributed by Xiaoyu Yao.

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java

@@ -192,7 +192,9 @@ public class SCMNodeManager
       // registration we call this, after adding to nodeStateMap. And also
       // from eventhandler it is called only if it has node Report.
       DatanodeInfo datanodeInfo = nodeStateManager.getNode(dnId);
-      datanodeInfo.updateStorageReports(nodeReport.getStorageReportList());
+      if (nodeReport != null) {
+        datanodeInfo.updateStorageReports(nodeReport.getStorageReportList());
+      }
 
     } catch (NodeNotFoundException e) {
       LOG.debug("SCM updateNodeStat based on heartbeat from previous " +

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java → hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java

@@ -72,9 +72,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
- * Test the Node Manager class.
+ * Test the SCM Node Manager class.
  */
-public class TestNodeManager {
+public class TestSCMNodeManager {
 
   private File testDir;
 
@@ -88,7 +88,7 @@ public class TestNodeManager {
   @Before
   public void setup() {
     testDir = PathUtils.getTestDir(
-        TestNodeManager.class);
+        TestSCMNodeManager.class);
   }
 
   @After