Merge pull request #989 from oracle/testjenkins

Fix integration test regression and discoverDomain

Author: rjeberhard

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

@@ -167,5 +167,6 @@ def get_roles(self):
                         # put it in the model
                         model[role_name] = dict()
                         model[role_name][model_constants.EXPRESSION] =  role_expression
-            return model_folder, model
+        _logger.exiting(class_name=_class_name, method_name=_method_name, result=model)
+        return model_folder, model
 

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

@@ -158,7 +158,6 @@ protected void verifyResult(ExecResult result, String matchString) throws Except
         if(result.exitValue() != 0 || !result.stdout().contains(matchString)) {
             logger.info("DEBUG: result.exitValue=" + result.exitValue());
             logger.info("DEBUG: result.stdout=" + result.stdout());
-            System.exit(0);
             throw new Exception("result stdout does not contains the expected string: " + matchString);
         }
     }