Merge pull request #996 from Megala21/test_case_fixes

Increasing the timeout in test cases

modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java

@@ -102,7 +102,8 @@ public class CarbonServerManagerExtension {
 
                     }
                 });
-                ClientConnectionUtil.waitForPort(defaultHttpPort + this.portOffset, 300000L, false, (String)this.automationContext.getInstance().getHosts().get("default"));
+                ClientConnectionUtil.waitForPort(defaultHttpPort + this.portOffset, DEFAULT_START_STOP_WAIT_MS, false, (String)this
+                        .automationContext.getInstance().getHosts().get("default"));
                 long time = System.currentTimeMillis() + 60000L;
 
                 while(true) {

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java

@@ -58,9 +58,10 @@ public class MobileDeviceManagementWithNoDevices extends TestBase {
 
         while (!checkScopes(Constants.APIApplicationRegistration.PERMISSION_LIST)) {
             TimeUnit.SECONDS.sleep(5);
-            long WAIT_TIME = 30000;
+            long WAIT_TIME = 40000;
             if (System.currentTimeMillis() - startTime > WAIT_TIME) {
-                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " time-out has happened");
+                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " ms time-out has "
+                        + "happened");
             }
         }
     }