|
1 | | -// Copyright (c) 2020, 2022, Oracle and/or its affiliates. |
| 1 | +// Copyright (c) 2020, 2023, Oracle and/or its affiliates. |
2 | 2 | // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. |
3 | 3 |
|
4 | 4 | package oracle.weblogic.kubernetes; |
|
55 | 55 | import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResource; |
56 | 56 | import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists; |
57 | 57 | import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify; |
| 58 | +import static oracle.weblogic.kubernetes.utils.DomainUtils.shutdownDomainAndVerify; |
58 | 59 | import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret; |
59 | 60 | import static oracle.weblogic.kubernetes.utils.LoggingUtil.checkPodLogContainsString; |
60 | 61 | import static oracle.weblogic.kubernetes.utils.LoggingUtil.doesPodLogContainString; |
@@ -168,10 +169,8 @@ public static void initAll(@Namespaces(2) List<String> namespaces) { |
168 | 169 | @AfterEach |
169 | 170 | public void afterEach() { |
170 | 171 | logger.info("Deleting the domain resource"); |
| 172 | + shutdownDomainAndVerify(domainNamespace, domainUid, replicaCount); |
171 | 173 | TestActions.deleteDomainCustomResource(domainUid, domainNamespace); |
172 | | - checkPodDoesNotExist(adminServerPodName, domainUid, domainNamespace); |
173 | | - checkPodDoesNotExist(managedServerPodNamePrefix + 1, domainUid, domainNamespace); |
174 | | - checkPodDoesNotExist(managedServerPodNamePrefix + 2, domainUid, domainNamespace); |
175 | 174 | checkPodDoesNotExist(indManagedServerPodName1, domainUid, domainNamespace); |
176 | 175 | checkPodDoesNotExist(indManagedServerPodName2, domainUid, domainNamespace); |
177 | 176 | if (cluster != null) { |
|
0 commit comments