Skip to content

Commit d8ae539

Browse files
committed
Fix regression in integration test
1 parent 415082f commit d8ae539

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,6 @@ def get_roles(self):
168168
model[role_name] = dict()
169169
model[role_name][model_constants.EXPRESSION] = role_expression
170170
return model_folder, model
171+
else:
172+
return model_folder, model
171173

system-test/src/test/java/oracle/weblogic/deploy/integration/BaseTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ protected void verifyResult(ExecResult result, String matchString) throws Except
158158
if(result.exitValue() != 0 || !result.stdout().contains(matchString)) {
159159
logger.info("DEBUG: result.exitValue=" + result.exitValue());
160160
logger.info("DEBUG: result.stdout=" + result.stdout());
161-
System.exit(0);
162161
throw new Exception("result stdout does not contains the expected string: " + matchString);
163162
}
164163
}

system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,9 +512,6 @@ public void testFDiscoverDomainWithRequiredArgument() throws Exception {
512512

513513
logger.info("executing command: " + cmd);
514514
ExecResult result = ExecCommand.exec(cmd);
515-
logger.info("DEBUG: result rc=" + result.exitValue());
516-
logger.info("DEBUG: result stdout" + result.stdout());
517-
logger.info("DEBUG: result stderr" + result.stderr());
518515

519516
verifyResult(result, "discoverDomain.sh completed successfully");
520517

0 commit comments

Comments
 (0)