diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b25c4e953..9f4c6e590 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -489,8 +489,9 @@ stages: cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Lidarr/. ./bin/ displayName: Move Package Contents - bash: | - chmod a+x ${TESTSFOLDER}/test.sh - ${TESTSFOLDER}/test.sh ${OSNAME} Integration Test + cd ${TESTSFOLDER} + chmod a+x test.sh + ./test.sh ${OSNAME} Integration Test displayName: Run Integration Tests - task: PublishTestResults@2 inputs: @@ -566,8 +567,9 @@ stages: cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Lidarr/. ./bin/ displayName: Move Package Contents - bash: | - chmod a+x ${TESTSFOLDER}/test.sh - ${TESTSFOLDER}/test.sh Linux Integration Test + cd ${TESTSFOLDER} + chmod a+x test.sh + ./test.sh Linux Integration Test displayName: Run Integration Tests - task: PublishTestResults@2 inputs: diff --git a/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj index 0458cfd28..ec44dbbbc 100644 --- a/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Lidarr.Integration.Test.csproj @@ -19,4 +19,9 @@ + + + Always + + diff --git a/src/NzbDrone.Integration.Test/integration.runsettings b/src/NzbDrone.Integration.Test/integration.runsettings new file mode 100644 index 000000000..500abe263 --- /dev/null +++ b/src/NzbDrone.Integration.Test/integration.runsettings @@ -0,0 +1,11 @@ + + + + 1 + + true + + + 1 + + diff --git a/test.sh b/test.sh index 5fbe9374b..35b42e3c9 100755 --- a/test.sh +++ b/test.sh @@ -49,6 +49,7 @@ if [ "$TYPE" = "Unit" ]; then WHERE="$WHERE&Category!=IntegrationTest&Category!=AutomationTest" elif [ "$TYPE" = "Integration" ] || [ "$TYPE" = "int" ] ; then WHERE="$WHERE&Category=IntegrationTest" + VSTEST_PARAMS="$VSTEST_PARAMS --settings:$TEST_DIR/integration.runsettings" elif [ "$TYPE" = "Automation" ] ; then WHERE="$WHERE&Category=AutomationTest" else