HDDS-1536. testSCMSafeModeRestrictedOp is failing consistently. Contributed by Xiaoyu Yao. (#865)

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java

@@ -223,6 +223,7 @@ public class TestScmSafeMode {
     assertTrue(cluster.getStorageContainerManager().isInSafeMode());
     cluster.startHddsDatanodes();
     cluster.waitForClusterToBeReady();
+    cluster.waitTobeOutOfSafeMode();
     assertFalse(cluster.getStorageContainerManager().isInSafeMode());
 
     // Test2: Test safe mode  when containers are there in system.
@@ -301,6 +302,7 @@ public class TestScmSafeMode {
 
     cluster.startHddsDatanodes();
     cluster.waitForClusterToBeReady();
+    cluster.waitTobeOutOfSafeMode();
     assertFalse(scm.isInSafeMode());
 
     TestStorageContainerManagerHelper helper =