Skip to content

Commit 52194eb

Browse files
authored
Merge pull request #1059 from oracle/jrftest1
add more jrf tests in Operator
2 parents b4e307b + eda732b commit 52194eb

File tree

12 files changed

+850
-44
lines changed

12 files changed

+850
-44
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class BaseTest {
6464
private static int waitTimePod = 5;
6565
private static String leaseId = "";
6666
private static String branchName = "";
67-
private static String appLocationInPod = "/u01/oracle/apps";
67+
protected static String appLocationInPod = "/u01/oracle/apps";
6868
private static String appLocationOnHost;
6969
private static Properties appProps;
7070

@@ -350,13 +350,24 @@ public void testWSLoadBalancing(Domain domain) throws Exception {
350350
logger.info("Done - testWSLoadBalancing");
351351
}
352352

353+
/**
354+
* use default cluster service port 8011
355+
*
356+
* @param operator
357+
* @param domain
358+
* @throws Exception
359+
*/
360+
public void testDomainLifecyle(Operator operator, Domain domain) throws Exception {
361+
testDomainLifecyle(operator, domain, 8011);
362+
}
363+
353364
/**
354365
* Restarting the domain should not have any impact on Operator managing the domain, web app load
355366
* balancing and node port service
356367
*
357368
* @throws Exception
358369
*/
359-
public void testDomainLifecyle(Operator operator, Domain domain) throws Exception {
370+
public void testDomainLifecyle(Operator operator, Domain domain, int port) throws Exception {
360371
logger.info("Inside testDomainLifecyle");
361372
domain.destroy();
362373
domain.create();
@@ -373,7 +384,7 @@ public void testDomainLifecyle(Operator operator, Domain domain) throws Exceptio
373384
// intermittent failure, see OWLS-73416
374385
// testWSLoadBalancing(domain);
375386
domain.verifyAdminServerExternalService(getUsername(), getPassword());
376-
domain.verifyHasClusterServiceChannelPort("TCP", 8011, TESTWEBAPP + "/");
387+
domain.verifyHasClusterServiceChannelPort("TCP", port, TESTWEBAPP + "/");
377388
logger.info("Done - testDomainLifecyle");
378389
}
379390

0 commit comments

Comments
 (0)