Merge pull request #1502 from phac-nml/fix/delete-from-filesystem-mer…

…ge-test-failures Fix tests in Development due to delete.from.filesystem tag
phac-nml · Oct 12, 2023 · 660c918 · 660c918
2 parents de36eab + bb9f875
commit 660c918
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -355,6 +355,7 @@ val permittedTestSystemProperties = listOf(
     "server.base.url",
     "server.port",
     "file.processing.decompress",
+    "delete.from.filesystem",
     "spring.datasource.dbcp2.max-wait",
     "webdriver.chrome.driver",
     "webdriver.selenium.url",
@@ -375,6 +376,7 @@ fun createIntegrationTestTask(name: String, tags: String?, excludeListeners: Str
             "irida.it.headless" to "true",
             "spring.profiles.active" to "test",
             "irida.it.rootdirectory" to temporaryDir,
+            "delete.from.filesystem" to "true",
             "sequence.file.base.directory" to "${temporaryDir}/sequence-file-base",
             "reference.file.base.directory" to "${temporaryDir}/reference-file-base",
             "output.file.base.directory" to "${temporaryDir}/output-file-base"

diff --git a/...orefacility/bioinformatics/irida/service/impl/integration/SequencingRunServiceImplIT.java b/...orefacility/bioinformatics/irida/service/impl/integration/SequencingRunServiceImplIT.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -283,7 +282,6 @@ public void testDeleteCascadeToSample() {
 
 	@Test
 	@WithMockUser(username = "fbristow", password = "password1", roles = "ADMIN")
-	@Disabled
 	public void testDeleteFilesOnFilesystem() throws IOException {
 		SequencingRun miseqRun = miseqRunService.read(1L);
 		Path sequenceFile = Files.createTempFile(null, null);