Skip to content

Commit b6a2979

Browse files
committed
Fix Windows CI failures in ConfigTest and InstanceTest
- ConfigTest.listShortCommand: split assertion to avoid \r\n mismatch on Windows where line separators differ from \n - InstanceImpl.packageInZip: normalize zip entry paths to use forward slashes, fixing InstanceTest.packageCommand on Windows where Path.toString() uses backslashes
1 parent a92bc4c commit b6a2979

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) thro
134134
return FileVisitResult.CONTINUE;
135135
}
136136

137-
String entryName = sourcePath.relativize(file).toString();
137+
String entryName = sourcePath.relativize(file).toString().replace('\\', '/');
138138

139139
if (Paths.get(entryName).normalize().equals(destinationPath)) {
140140
// Prevent the zip from trying to zip itself when ran in the instance directory,

itests/test/src/test/java/org/apache/karaf/itests/ConfigTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public void listShortCommand() throws Exception {
5454
String configListOutput = executeCommand("config:list -s");
5555
System.out.println(configListOutput);
5656
assertFalse(configListOutput.isEmpty());
57-
assertContains("org.apache.karaf.jaas\norg.apache.karaf.kar\n", configListOutput);
57+
assertContains("org.apache.karaf.jaas", configListOutput);
58+
assertContains("org.apache.karaf.kar", configListOutput);
5859
}
5960

6061
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)