Skip to content

Commit bc7b500

Browse files
committed
fix
1 parent 5de46c8 commit bc7b500

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void testCustomSitConfigOverridesForDomain() throws Exception {
128128
ExecResult result =
129129
TestUtils.exec(
130130
KUBE_EXEC_CMD
131-
+ " 'sh runSitConfigTests.sh"
131+
+ " 'sh runSitConfigTests.sh "
132132
+ fqdn
133133
+ " "
134134
+ T3CHANNELPORT
@@ -163,7 +163,7 @@ public void testCustomSitConfigOverridesForJdbc() throws Exception {
163163
ExecResult result =
164164
TestUtils.exec(
165165
KUBE_EXEC_CMD
166-
+ " 'sh runSitConfigTests.sh"
166+
+ " 'sh runSitConfigTests.sh "
167167
+ fqdn
168168
+ " "
169169
+ T3CHANNELPORT
@@ -196,7 +196,7 @@ public void testCustomSitConfigOverridesForJms() throws Exception {
196196
ExecResult result =
197197
TestUtils.exec(
198198
KUBE_EXEC_CMD
199-
+ " 'sh runSitConfigTests.sh"
199+
+ " 'sh runSitConfigTests.sh "
200200
+ fqdn
201201
+ " "
202202
+ T3CHANNELPORT
@@ -226,11 +226,10 @@ public void testCustomSitConfigOverridesForWldf() throws Exception {
226226
boolean testCompletedSuccessfully = false;
227227
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
228228
logTestBegin(testMethod);
229-
TestUtils.exec(fqdn);
230229
ExecResult result =
231230
TestUtils.exec(
232231
KUBE_EXEC_CMD
233-
+ " 'sh runSitConfigTests.sh"
232+
+ " 'sh runSitConfigTests.sh "
234233
+ fqdn
235234
+ " "
236235
+ T3CHANNELPORT
@@ -278,17 +277,20 @@ private static void copySitConfigFiles() throws IOException {
278277
"jms-ClusterJmsSystemResource.xml",
279278
"version.txt"
280279
};
281-
for (String file : files) {
280+
for (String file : files) {
282281
Path path = Paths.get(src_dir, file);
282+
logger.log(Level.INFO, "Copying {0}", path.toString());
283283
Charset charset = StandardCharsets.UTF_8;
284284
String content = new String(Files.readAllBytes(path), charset);
285285
content = content.replaceAll("JDBC_URL", JDBC_URL);
286286
path = Paths.get(dst_dir, file);
287-
Files.write(path, content.getBytes(charset), StandardOpenOption.TRUNCATE_EXISTING);
287+
logger.log(Level.INFO, "to {0}", path.toString());
288+
Files.write(path, content.getBytes(charset));
288289
}
289290
}
290291

291292
private void assertResult(ExecResult result) {
293+
logger.log(Level.INFO, result.stdout().trim());
292294
Assert.assertFalse(result.stdout().toLowerCase().contains("error"));
293295
Assert.assertFalse(result.stderr().toLowerCase().contains("error"));
294296
Assert.assertEquals(0, result.exitValue());

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,6 @@ private void initialize(Map<String, Object> inputDomainMap) throws Exception {
12561256
+ "-"
12571257
+ domainMap.get("configOverrides")
12581258
+ " --from-file "
1259-
+ BaseTest.getProjectRoot()
12601259
+ configOverridesFile;
12611260
ExecResult result = ExecCommand.exec(cmd);
12621261
if (result.exitValue() != 0) {

integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ public static void main(String args[]) throws Exception {
110110
String JDBC_URL = args[5];
111111
test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0", JDBC_URL);
112112
}
113-
114-
if (testName.equals("testSystemResourcesJDBCAttributeChangeSecret")) {
115-
test.testSystemResourcesJDBCAttributeChangeSecret("JdbcTestDataSource-1");
116-
}
117113
if (testName.equals("testCustomSitConfigOverridesForJms")) {
118114
test.testSystemResourcesJMSAttributeChange();
119115
}

0 commit comments

Comments
 (0)