artin/nzbhydra2
1
0
Fork 0
mirror of https://github.com/theotherp/nzbhydra2.git synced 2026-02-06 11:17:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split into testdocker and testwindows profiles

Browse Source
This commit is contained in:
TheOtherP 2023-11-20 14:54:02 +01:00
parent eb0e9a6a0b
commit ac9af52af2
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/system-test.yml vendored
View File

@ -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

1
core/src/main/resources/config/application-build.properties
View File

@ -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

4
tests/system/src/test/java/org/nzbhydra/NzbHandlingTest.java
View File

@ -78,7 +78,9 @@ public class NzbHandlingTest {
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");
}

9
tests/system/src/test/resources/application-build.properties
View File

@ -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

6
tests/system/src/test/resources/application-testdocker.properties Normal file
View File

@ -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

4
tests/system/src/test/resources/application-testwindows.properties Normal file
View File

@ -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

4
tests/system/src/test/resources/application.properties
View File

@ -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