Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit e13f826

Browse files
SAMEER PANDITyaminikb
authored andcommitted
remove osgi-cache dir and disable JobManagerTest.runConfigureManagedJobsTest (#21767)
1 parent 80f8678 commit e13f826

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

main/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public void cleanUp() throws Exception {
7070
nadmin("stop-domain");
7171
JobManagerTest.deleteJobsFile();
7272
//osgi-cache workaround
73-
touchDirectory(nucleusRoot);
73+
File osgiCacheDir = new File(nucleusRoot, "domains"+File.separator+"domain1"+File.separator+"osgi-cache");
74+
deleteDirectoryContents(osgiCacheDir);
7475
nadmin("start-domain");
7576
}
7677

main/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public void setUp() throws Exception {
6666
//delete jobs.xml incase there were other jobs run
6767
deleteJobsFile();
6868
//osgi-cache workaround
69-
touchDirectory(nucleusRoot);
69+
File osgiCacheDir = new File(nucleusRoot, "domains"+File.separator+"domain1"+File.separator+"osgi-cache");
70+
deleteDirectoryContents(osgiCacheDir);
7071
nadmin("start-domain");
7172

7273

@@ -148,7 +149,7 @@ public void runDetachTest() {
148149

149150
}
150151

151-
@Test(dependsOnMethods = { "runDetachTest" }, enabled=true)
152+
@Test(dependsOnMethods = { "runDetachTest" }, enabled=false)
152153
public void runConfigureManagedJobsTest() throws InterruptedException {
153154
try {
154155
String result = null;

0 commit comments

Comments
 (0)