Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d173997

Browse files
work around for missing trust service identity asserter schematype ja... (#1439)
* work around for missing trust service identity asserter schematype jar in discoverDomain * system test was running without schema file. Change expected return code
1 parent 8bf0d55 commit d173997

File tree

2 files changed

+10
-5
lines changed
  • core/src/main/python/wlsdeploy/tool/discover
  • integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration

2 files changed

+10
-5
lines changed

‎core/src/main/python/wlsdeploy/tool/discover/discoverer.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,12 @@ def _discover_artificial_folder(self, model_subfolder_type, location, name_token
454454
location.add_name_token(name_token, name)
455455
massaged = self._inspect_artificial_folder_name(name, location)
456456
location.add_name_token(name_token, massaged)
457-
artificial = self._get_artificial_type(location)
457+
# circumventing problems if the trust identity asserter schematype jar
458+
# is not in the oracle home. Force it to have the correct name.
459+
if name == 'Trust Service Identity Asserter':
460+
artificial = 'TrustServiceIdentityAsserter'
461+
else:
462+
artificial = self._get_artificial_type(location)
458463
if artificial is None:
459464
if self._aliases.is_custom_folder_allowed(location):
460465
_logger.fine('WLSDPLY-06148', model_subfolder_type, massaged, location.get_folder_path(),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exceptio
530530
+ " -domain_type RestrictedJRF";
531531
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
532532
// SecurityConfiguration warning
533-
assertEquals(1, result.exitValue(), "Unexpected return code");
533+
assertEquals(0, result.exitValue(), "Unexpected return code");
534534

535535
// verify model file
536536
verifyModelFile(discoveredModel.toString());
@@ -569,7 +569,7 @@ void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
569569
try (PrintWriter out = getTestMethodWriter(testInfo)) {
570570
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
571571
// SecurityConfiguration warning
572-
assertEquals(1, result.exitValue(), "Unexpected return code");
572+
assertEquals(0, result.exitValue(), "Unexpected return code");
573573

574574
// verify model file
575575
verifyModelFile(discoveredModelFile.toString());
@@ -601,7 +601,7 @@ void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
601601
try (PrintWriter out = getTestMethodWriter(testInfo)) {
602602
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
603603
// SecurityConfiguration warning
604-
assertEquals(1, result.exitValue(), "Unexpected return code");
604+
assertEquals(0, result.exitValue(), "Unexpected return code");
605605

606606
// verify model file and variable file
607607
verifyModelFile(discoveredModelFile.toString());
@@ -652,7 +652,7 @@ void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
652652

653653
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
654654
// SecurityConfiguration warning
655-
assertEquals(1, result.exitValue(), "Unexpected return code");
655+
assertEquals(0, result.exitValue(), "Unexpected return code");
656656

657657
// verify model file
658658
verifyModelFile(discoveredModelFile.toString());

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /