diff options
-rw-r--r-- | config/test.yaml | 6 | ||||
-rwxr-xr-x | scripts/ci.sh | 2 | ||||
-rw-r--r-- | server/tests/api/activitypub/refresher.ts | 6 | ||||
-rw-r--r-- | shared/extra-utils/videos/video-imports.ts | 2 |
4 files changed, 6 insertions, 10 deletions
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: | |||
86 | videos: | 86 | videos: |
87 | http: | 87 | http: |
88 | enabled: true | 88 | enabled: true |
89 | proxy: | 89 | proxy: |
90 | enabled: false | 90 | enabled: false |
91 | url: "" | 91 | url: "" |
92 | torrent: | 92 | torrent: |
93 | enabled: true | 93 | enabled: true |
94 | 94 | ||
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 | |||
9 | 9 | ||
10 | killall -q peertube || true | 10 | killall -q peertube || true |
11 | 11 | ||
12 | perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "'"$PROXY_URL"'"#' config/test.yaml | 12 | perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "https://cpy.re:7899"#' config/test.yaml |
13 | 13 | ||
14 | if [ "$1" = "misc" ]; then | 14 | if [ "$1" = "misc" ]; then |
15 | npm run build -- --light-fr | 15 | 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 () { | |||
91 | }) | 91 | }) |
92 | 92 | ||
93 | it('Should not update a remote video if the remote instance is down', async function () { | 93 | it('Should not update a remote video if the remote instance is down', async function () { |
94 | this.timeout(60000) | 94 | this.timeout(70000) |
95 | 95 | ||
96 | killallServers([ servers[ 1 ] ]) | 96 | killallServers([ servers[ 1 ] ]) |
97 | 97 | ||
@@ -106,10 +106,6 @@ describe('Test AP refresher', function () { | |||
106 | 106 | ||
107 | await reRunServer(servers[ 1 ]) | 107 | await reRunServer(servers[ 1 ]) |
108 | 108 | ||
109 | // Should not refresh the video, even if the last refresh failed (to avoid a loop on dead instances) | ||
110 | await getVideo(servers[ 0 ].url, videoUUID3) | ||
111 | await waitJobs(servers) | ||
112 | |||
113 | await getVideo(servers[ 0 ].url, videoUUID3, 200) | 109 | await getVideo(servers[ 0 ].url, videoUUID3, 200) |
114 | }) | 110 | }) |
115 | }) | 111 | }) |
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' | |||
3 | import { makeGetRequest, makeUploadRequest } from '../requests/requests' | 3 | import { makeGetRequest, makeUploadRequest } from '../requests/requests' |
4 | 4 | ||
5 | function getYoutubeVideoUrl () { | 5 | function getYoutubeVideoUrl () { |
6 | return 'https://youtu.be/msX3jv1XdvM' | 6 | return 'http://www.youtube.com/watch?v=msX3jv1XdvM' |
7 | } | 7 | } |
8 | 8 | ||
9 | function getMagnetURI () { | 9 | function getMagnetURI () { |