diff options
Diffstat (limited to 'ui-ci/src/main/java/org')
| -rw-r--r-- | ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java | 4 | ||||
| -rw-r--r-- | ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java index 2e05c2c059..2dcab070ef 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java @@ -102,6 +102,7 @@ public abstract class SetupCDTest extends DriverFactory { /**************** PRIVATES ****************/ private static String url; + private static boolean uiSimulator; private static boolean localEnv = true; private static OnboardCSVReport csvReport; private static Map<?, ?> credentials; @@ -301,11 +302,12 @@ public abstract class SetupCDTest extends DriverFactory { protected static String setUrl() { url = getConfig().getUrl(); + uiSimulator = getConfig().isUiSimulator(); if (url == null) { String message = "no URL found"; System.out.println(message); Assert.fail(message); - } else if (!url.contains("localhost") && !url.contains("192.168.33.10") && !url.contains("127.0.0.1")) { + } else if (!url.contains("localhost") && !url.contains("192.168.33.10") && !url.contains("127.0.0.1") && !url.contains("192.168.50.5") && !uiSimulator==true) { localEnv = false; } return url; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java index d455243227..a9f6cc5c66 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java @@ -309,7 +309,7 @@ public class FileHandling { public static void deleteDirectory(String directoryPath) { File dir = new File(directoryPath); try { - FileUtils.deleteDirectory(dir); + FileUtils.cleanDirectory(dir); } catch (IOException e) { System.out.println("Failed to delete " + dir); SetupCDTest.getExtendTest().log(Status.INFO, "Failed to delete " + dir); |