Skip to content

Commit 718c42f

Browse files
committed
Merge branch 'reportmain' into 'main'
Fix main sequential nightly run not showing all test classes in the test report See merge request weblogic-cloud/weblogic-kubernetes-operator!4981
2 parents 1d9d1e5 + 9c6e09b commit 718c42f

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsMiiLegacySample.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.List;
99
import java.util.Map;
1010

11+
import oracle.weblogic.kubernetes.actions.impl.UniqueName;
1112
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
1213
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1314
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -50,7 +51,9 @@
5051
import static oracle.weblogic.kubernetes.actions.TestActions.imagePull;
5152
import static oracle.weblogic.kubernetes.actions.TestActions.imagePush;
5253
import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
54+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.backupReports;
5355
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
56+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.restoreReports;
5457
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5558
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
5659
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
@@ -174,7 +177,9 @@ static void initAll(@Namespaces(3) List<String> namespaces) {
174177
@Test
175178
@Order(1)
176179
void testInstallOperator() {
180+
String backupReports = backupReports(UniqueName.uniqueName(this.getClass().getSimpleName()));
177181
execTestScriptAndAssertSuccess("-oper", "Failed to run -oper");
182+
restoreReports(backupReports);
178183
}
179184

180185
/**

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsMiiSample.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.List;
99
import java.util.Map;
1010

11+
import oracle.weblogic.kubernetes.actions.impl.UniqueName;
1112
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
1213
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1314
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -51,7 +52,9 @@
5152
import static oracle.weblogic.kubernetes.actions.TestActions.imagePull;
5253
import static oracle.weblogic.kubernetes.actions.TestActions.imagePush;
5354
import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
55+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.backupReports;
5456
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
57+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.restoreReports;
5558
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5659
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
5760
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
@@ -162,7 +165,9 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
162165
@Test
163166
@Order(1)
164167
public void testInstallOperator() {
168+
String backupReports = backupReports(UniqueName.uniqueName(this.getClass().getSimpleName()));
165169
execTestScriptAndAssertSuccess("-oper", "Failed to run -oper");
170+
restoreReports(backupReports);
166171
}
167172

168173
/**

0 commit comments

Comments
 (0)