From: Chocobozzz Date: Wed, 22 Jan 2020 08:24:26 +0000 (+0100) Subject: Use a filtered proxy without variables X-Git-Tag: v2.1.0-rc.1~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6848b9f4b2ff8a49d57d88a8bba3a6b8352d6f7e;p=oweals%2Fpeertube.git Use a filtered proxy without variables --- diff --git a/config/test.yaml b/config/test.yaml index 5d98b41c4..5758c1887 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -86,9 +86,9 @@ import: videos: http: enabled: true - proxy: - enabled: false - url: "" + proxy: + enabled: false + url: "" torrent: enabled: true diff --git a/scripts/ci.sh b/scripts/ci.sh index 9ff640c8e..6281e1aa4 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -9,7 +9,7 @@ fi killall -q peertube || true -perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "'"$PROXY_URL"'"#' config/test.yaml +perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "https://cpy.re:7899"#' config/test.yaml if [ "$1" = "misc" ]; then npm run build -- --light-fr diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 2a6be97c6..aa4bc6c0f 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts @@ -91,7 +91,7 @@ describe('Test AP refresher', function () { }) it('Should not update a remote video if the remote instance is down', async function () { - this.timeout(60000) + this.timeout(70000) killallServers([ servers[ 1 ] ]) @@ -106,10 +106,6 @@ describe('Test AP refresher', function () { await reRunServer(servers[ 1 ]) - // Should not refresh the video, even if the last refresh failed (to avoid a loop on dead instances) - await getVideo(servers[ 0 ].url, videoUUID3) - await waitJobs(servers) - await getVideo(servers[ 0 ].url, videoUUID3, 200) }) }) diff --git a/shared/extra-utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts index ec77cdcda..150cc94ed 100644 --- a/shared/extra-utils/videos/video-imports.ts +++ b/shared/extra-utils/videos/video-imports.ts @@ -3,7 +3,7 @@ import { VideoImportCreate } from '../../models/videos' import { makeGetRequest, makeUploadRequest } from '../requests/requests' function getYoutubeVideoUrl () { - return 'https://youtu.be/msX3jv1XdvM' + return 'http://www.youtube.com/watch?v=msX3jv1XdvM' } function getMagnetURI () {