Split into testdocker and testwindows profiles

theotherp · Nov 20, 2023 · ac9af52 · ac9af52
1 parent eb0e9a6
commit ac9af52
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -65,7 +65,7 @@ jobs:
             matrix:
                 test: [ { port: 5076, name: core }, { port: 5077, name: v1Migration } ]
         env:
-            spring_profiles_active: build,systemtest,${{ matrix.test.name }}
+            spring_profiles_active: build,systemtest,testdocker,${{ matrix.test.name }}
             nzbhydra_port: ${{ matrix.test.port }}
             nzbhydra.port: ${{ matrix.test.port }}
             nzbhydra_name: ${{ matrix.test.name }}
@@ -173,7 +173,7 @@ jobs:
         needs: [ waitForNative, buildMockserver ]
         runs-on: windows-latest
         env:
-            spring_profiles_active: build,systemtest,core
+            spring_profiles_active: build,systemtest,core,testwindows
             nzbhydra_port: 5076
             nzbhydra.port: 5076
             nzbhydra_name: windows

diff --git a/core/src/main/resources/config/application-build.properties b/core/src/main/resources/config/application-build.properties
@@ -1,4 +1,3 @@
-main.useCsrf=false
 nzbhydra.changelogUrl=http://mockserver:5080/changelog
 nzbhydra.repositoryBaseUrl=http://mockserver:5080/repos/theotherp/nzbhydra2
 nzbhydra.newsUrl=http://mockserver:5080/static/news.json
diff --git a/tests/system/src/test/java/org/nzbhydra/NzbHandlingTest.java b/tests/system/src/test/java/org/nzbhydra/NzbHandlingTest.java
@@ -78,7 +78,9 @@ public void shouldSaveToBlackhole() throws Exception {
         final String guid = searchResultProvider.findOneGuid();
         hydraClient.put("/internalapi/saveNzbToBlackhole", guid);
         final File[] files = new File(blackholeFolderTestAccess).listFiles();
-        assertThat(files).isNotEmpty();
+        assertThat(files)
+                .as("Expected files to exist in " + blackholeFolderTestAccess)
+                .isNotNull().isNotEmpty();
         assertThat(files[0].getName()).endsWith(".nzb");
     }
 

diff --git a/tests/system/src/test/resources/application-build.properties b/tests/system/src/test/resources/application-build.properties
@@ -1,10 +1,3 @@
 nzbhydra.mockUrl=http://mockserver:5080
 sonarr.host=http://sonarr:8989
-radarr.host=http://radarr:7878
-
-#Where hydra is supposed to store NZBs
-blackholeFolder.nzbhydra=/hydraBlackhole
-#The folder under which the test can access the black hole
-blackholeFolder.testaccess=/tmp/hydraBlackhole_${nzbhydra.name}
-
-docker.host=unix:///var/run/docker.sock
+radarr.host=http://radarr:7878
diff --git a/tests/system/src/test/resources/application-testdocker.properties b/tests/system/src/test/resources/application-testdocker.properties
@@ -0,0 +1,6 @@
+#Where hydra is supposed to store NZBs
+blackholeFolder.nzbhydra=/hydraBlackhole
+#The folder under which the test can access the black hole
+blackholeFolder.testaccess=/tmp/hydraBlackhole_${nzbhydra.name}
+
+docker.host=unix:///var/run/docker.sock
diff --git a/tests/system/src/test/resources/application-testwindows.properties b/tests/system/src/test/resources/application-testwindows.properties
@@ -0,0 +1,4 @@
+#Where hydra is supposed to store NZBs
+blackholeFolder.nzbhydra=/hydraBlackhole
+#The folder under which the test can access the black hole
+blackholeFolder.testaccess=/hydraBlackhole
diff --git a/tests/system/src/test/resources/application.properties b/tests/system/src/test/resources/application.properties
@@ -22,9 +22,5 @@ nzbhydra.mockUrl=http://127.0.0.1:5080
 spring.main.banner-mode=off
 sonarr.host=http://127.0.0.1:8989
 radarr.host=http://127.0.0.1:7878
-#Where hydra is supposed to store NZBs
-blackholeFolder.nzbhydra=${java.io.tmpdir}/hydraBlackhole
-#The folder under which the test can access the black hole
-blackholeFolder.testaccess=${java.io.tmpdir}/hydraBlackhole
 
 docker.host=tcp://127.0.0.1:2376