aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--server/tests/api/videos/video-transcoder.ts2
-rw-r--r--shared/extra-utils/miscs/miscs.ts3
3 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c188c2074..042ffe0d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -98,11 +98,11 @@ jobs:
98 - name: Display directories state 98 - name: Display directories state
99 if: failure() 99 if: failure()
100 run: | 100 run: |
101 ls -l 101 ls -l test*
102 102
103 - name: Upload logs 103 - name: Upload logs
104 uses: actions/upload-artifact@v2 104 uses: actions/upload-artifact@v2
105 if: failure() 105 if: failure()
106 with: 106 with:
107 name: test-storages-${{ matrix.test_suite }} 107 name: test-storages-${{ matrix.test_suite }}
108 path: test*/logs 108 path: test*/logs/*
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 164843d32..f9500d617 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -434,7 +434,7 @@ describe('Test video transcoding', function () {
434 }) 434 })
435 435
436 it('Should downscale to the closest divisor standard framerate', async function () { 436 it('Should downscale to the closest divisor standard framerate', async function () {
437 this.timeout(160000) 437 this.timeout(200000)
438 438
439 let tempFixturePath: string 439 let tempFixturePath: string
440 440
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
index 429083fe9..aea9563cf 100644
--- a/shared/extra-utils/miscs/miscs.ts
+++ b/shared/extra-utils/miscs/miscs.ts
@@ -88,6 +88,7 @@ async function generateHighBitrateVideo () {
88 88
89 const exists = await pathExists(tempFixturePath) 89 const exists = await pathExists(tempFixturePath)
90 if (!exists) { 90 if (!exists) {
91 console.log('Generating high bitrate video.')
91 92
92 // Generate a random, high bitrate video on the fly, so we don't have to include 93 // Generate a random, high bitrate video on the fly, so we don't have to include
93 // a large file in the repo. The video needs to have a certain minimum length so 94 // a large file in the repo. The video needs to have a certain minimum length so
@@ -115,6 +116,8 @@ async function generateVideoWithFramerate (fps = 60) {
115 116
116 const exists = await pathExists(tempFixturePath) 117 const exists = await pathExists(tempFixturePath)
117 if (!exists) { 118 if (!exists) {
119 console.log('Generating video with framerate %d.', fps)
120
118 return new Promise<string>((res, rej) => { 121 return new Promise<string>((res, rej) => {
119 ffmpeg() 122 ffmpeg()
120 .outputOptions([ '-f rawvideo', '-video_size 1280x720', '-i /dev/urandom' ]) 123 .outputOptions([ '-f rawvideo', '-video_size 1280x720', '-i /dev/urandom' ])