aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-17 15:51:42 +0200
committerChocobozzz <me@florianbigard.com>2019-05-17 16:50:52 +0200
commit80b8ad2a7084c206efb194ddfbea13df860f0c5f (patch)
tree47a347a0e63338b9f29c0749c70aaba4aeac0702 /server/tests
parentb345a8047bfde1efa1fdbd249f25f663151265a8 (diff)
downloadPeerTube-80b8ad2a7084c206efb194ddfbea13df860f0c5f.tar.gz
PeerTube-80b8ad2a7084c206efb194ddfbea13df860f0c5f.tar.zst
PeerTube-80b8ad2a7084c206efb194ddfbea13df860f0c5f.zip
Update travis ffmpeg patch version
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/videos/multiple-servers.ts4
-rw-r--r--server/tests/api/videos/services.ts4
-rw-r--r--server/tests/api/videos/video-hls.ts4
-rw-r--r--server/tests/fixtures/preview.jpgbin4215 -> 6868 bytes
-rw-r--r--server/tests/fixtures/video_short1-preview.webm.jpgbin10181 -> 22654 bytes
5 files changed, 8 insertions, 4 deletions
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