diff options
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | server/tests/api/videos/multiple-servers.ts | 4 | ||||
-rw-r--r-- | server/tests/api/videos/services.ts | 4 | ||||
-rw-r--r-- | server/tests/api/videos/video-hls.ts | 4 | ||||
-rw-r--r-- | server/tests/fixtures/preview.jpg | bin | 4215 -> 6868 bytes | |||
-rw-r--r-- | server/tests/fixtures/video_short1-preview.webm.jpg | bin | 10181 -> 22654 bytes |
6 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5fa41fb43..8b3ec94d9 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -29,8 +29,8 @@ install: | |||
29 | - CC=gcc-4.9 CXX=g++-4.9 yarn install | 29 | - CC=gcc-4.9 CXX=g++-4.9 yarn install |
30 | 30 | ||
31 | before_script: | 31 | before_script: |
32 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.2-64bit-static.tar.xz" | 32 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.3-64bit-static.tar.xz" |
33 | - tar xf ffmpeg-release-4.0.2-64bit-static.tar.xz | 33 | - tar xf ffmpeg-release-4.0.3-64bit-static.tar.xz |
34 | - mkdir -p $HOME/bin | 34 | - mkdir -p $HOME/bin |
35 | - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin | 35 | - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin |
36 | - export PATH=$HOME/bin:$PATH | 36 | - export PATH=$HOME/bin:$PATH |
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 09b461200..e9625e5f7 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts | |||
@@ -215,7 +215,7 @@ describe('Test multiple servers', function () { | |||
215 | files: [ | 215 | files: [ |
216 | { | 216 | { |
217 | resolution: 240, | 217 | resolution: 240, |
218 | size: 187000 | 218 | size: 189000 |
219 | }, | 219 | }, |
220 | { | 220 | { |
221 | resolution: 360, | 221 | resolution: 360, |
@@ -223,7 +223,7 @@ describe('Test multiple servers', function () { | |||
223 | }, | 223 | }, |
224 | { | 224 | { |
225 | resolution: 480, | 225 | resolution: 480, |
226 | size: 383000 | 226 | size: 384000 |
227 | }, | 227 | }, |
228 | { | 228 | { |
229 | resolution: 720, | 229 | resolution: 720, |
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts index 38e232e5f..17172331f 100644 --- a/server/tests/api/videos/services.ts +++ b/server/tests/api/videos/services.ts | |||
@@ -41,8 +41,8 @@ describe('Test services', function () { | |||
41 | expect(res.body.width).to.equal(560) | 41 | expect(res.body.width).to.equal(560) |
42 | expect(res.body.height).to.equal(315) | 42 | expect(res.body.height).to.equal(315) |
43 | expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl) | 43 | expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl) |
44 | expect(res.body.thumbnail_width).to.equal(560) | 44 | expect(res.body.thumbnail_width).to.equal(850) |
45 | expect(res.body.thumbnail_height).to.equal(315) | 45 | expect(res.body.thumbnail_height).to.equal(480) |
46 | }) | 46 | }) |
47 | 47 | ||
48 | it('Should have a valid oEmbed response with small max height query', async function () { | 48 | it('Should have a valid oEmbed response with small max height query', async function () { |
diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts index eacd9ab79..39178bb1a 100644 --- a/server/tests/api/videos/video-hls.ts +++ b/server/tests/api/videos/video-hls.ts | |||
@@ -114,6 +114,8 @@ describe('Test HLS videos', function () { | |||
114 | }) | 114 | }) |
115 | 115 | ||
116 | it('Should update the video', async function () { | 116 | it('Should update the video', async function () { |
117 | this.timeout(10000) | ||
118 | |||
117 | await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { name: 'video 1 updated' }) | 119 | await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { name: 'video 1 updated' }) |
118 | 120 | ||
119 | await waitJobs(servers) | 121 | await waitJobs(servers) |
@@ -122,6 +124,8 @@ describe('Test HLS videos', function () { | |||
122 | }) | 124 | }) |
123 | 125 | ||
124 | it('Should delete videos', async function () { | 126 | it('Should delete videos', async function () { |
127 | this.timeout(10000) | ||
128 | |||
125 | await removeVideo(servers[0].url, servers[0].accessToken, videoUUID) | 129 | await removeVideo(servers[0].url, servers[0].accessToken, videoUUID) |
126 | await removeVideo(servers[0].url, servers[0].accessToken, videoAudioUUID) | 130 | await removeVideo(servers[0].url, servers[0].accessToken, videoAudioUUID) |
127 | 131 | ||
diff --git a/server/tests/fixtures/preview.jpg b/server/tests/fixtures/preview.jpg index c40ece838..cb5692281 100644 --- a/server/tests/fixtures/preview.jpg +++ b/server/tests/fixtures/preview.jpg | |||
Binary files differ | |||
diff --git a/server/tests/fixtures/video_short1-preview.webm.jpg b/server/tests/fixtures/video_short1-preview.webm.jpg index d2a068b78..157d3ca9a 100644 --- a/server/tests/fixtures/video_short1-preview.webm.jpg +++ b/server/tests/fixtures/video_short1-preview.webm.jpg | |||
Binary files differ | |||