mirror of https://github.com/apache/lucene.git
Fix test failures with testIndexUpgraderCommandLineArgs and ExtraFS.
This commit is contained in:
parent
f80d816ce7
commit
8710252116
|
@ -35,6 +35,7 @@ import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
@ -1655,10 +1656,14 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
|
||||||
SegmentInfos.readLatestCommit(origDir).getIndexCreatedVersionMajor();
|
SegmentInfos.readLatestCommit(origDir).getIndexCreatedVersionMajor();
|
||||||
Path dir = createTempDir(name);
|
Path dir = createTempDir(name);
|
||||||
try (FSDirectory fsDir = FSDirectory.open(dir)) {
|
try (FSDirectory fsDir = FSDirectory.open(dir)) {
|
||||||
|
// beware that ExtraFS might add extraXXX files
|
||||||
|
Set<String> extraFiles = Set.of(fsDir.listAll());
|
||||||
for (String file : origDir.listAll()) {
|
for (String file : origDir.listAll()) {
|
||||||
|
if (extraFiles.contains(file) == false) {
|
||||||
fsDir.copyFrom(origDir, file, file, IOContext.DEFAULT);
|
fsDir.copyFrom(origDir, file, file, IOContext.DEFAULT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String path = dir.toAbsolutePath().toString();
|
String path = dir.toAbsolutePath().toString();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue