diff options
author | Harald Musum <musum@yahooinc.com> | 2022-08-22 12:55:02 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-08-22 12:55:02 +0200 |
commit | 1efaeadc484678c694bbdd1e906c018a60fd7934 (patch) | |
tree | d60c0579157a1ea92995f1762da3e81d42ea22c7 /configserver/src | |
parent | 64ecc90f9b1670d870f4b7aba1715695ebf1f7af (diff) |
Manipulate file after creating session and remove unused method
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 4df653950e9..a8439a9061c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -59,10 +59,7 @@ import org.junit.rules.TemporaryFolder; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.UncheckedIOException; import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributeView; import java.nio.file.attribute.FileTime; import java.time.Duration; import java.time.Instant; @@ -502,13 +499,11 @@ public class ApplicationRepositoryTest { // Create a local session with invalid application package and check that expiring local sessions still works sessionId = 8; java.nio.file.Path applicationPath = tenantFileSystemDirs.getUserApplicationDir(sessionId).toPath(); - Files.createDirectory(applicationPath); - Files.writeString(Files.createFile(applicationPath.resolve("services.xml")), - Files.readString(Paths.get(illegalApp2.getAbsolutePath()).resolve(Paths.get("services.xml")))); - assertTrue(applicationPath.toFile().exists()); // App exists on disk session = sessionRepository.createRemoteSession(sessionId); sessionRepository.createSessionZooKeeperClient(sessionId).createNewSession(clock.instant()); sessionRepository.createSetStatusTransaction(session, Session.Status.PREPARE).commit(); + Files.createDirectory(applicationPath); + Files.writeString(Files.createFile(applicationPath.resolve("services.xml")), "non-legal xml"); assertEquals(0, sessionRepository.getLocalSessions().size()); // Will not show up in local sessions // Advance time, session SHOULD be deleted @@ -757,16 +752,6 @@ public class ApplicationRepositoryTest { return applicationRepository.getMetadataFromLocalSession(tenant, sessionId); } - private void setCreatedTime(java.nio.file.Path file, Instant createdTime) { - try { - BasicFileAttributeView attributes = Files.getFileAttributeView(file, BasicFileAttributeView.class); - FileTime time = FileTime.fromMillis(createdTime.toEpochMilli()); - attributes.setTimes(time, time, time); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - /** Stores all added or set values for each metric and context. */ static class MockMetric implements Metric { |