diff --git a/.gitignore b/.gitignore index a79cc6a97..debe118e1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ public/stylesheets/vendor uploads thumbnails config/production.yaml +ffmpeg diff --git a/.travis.yml b/.travis.yml index cb351c613..e6a92d883 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ before_script: - mkdir -p $HOME/bin - cp ffmpeg-*-64bit-static/{ffmpeg,ffprobe,ffserver} $HOME/bin - export PATH=$HOME/bin:$PATH + - export NODE_TEST_IMAGE=true after_failure: - cat test1/logs/all-logs.log diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js index 7c8698a0a..314269b5c 100644 --- a/server/tests/api/utils.js +++ b/server/tests/api/utils.js @@ -350,18 +350,25 @@ function searchVideoWithSort (url, search, sort, end) { } function testImage (url, videoName, imagePath, callback) { - request(url) - .get(imagePath) - .expect(200) - .end(function (err, res) { - if (err) return callback(err) - - fs.readFile(pathUtils.join(__dirname, 'fixtures', videoName + '.jpg'), function (err, data) { + // Don't test images if the node env is not set + // Because we need a special ffmpeg version for this test + if (process.env.NODE_TEST_IMAGE) { + request(url) + .get(imagePath) + .expect(200) + .end(function (err, res) { if (err) return callback(err) - callback(null, data.equals(res.body)) + fs.readFile(pathUtils.join(__dirname, 'fixtures', videoName + '.jpg'), function (err, data) { + if (err) return callback(err) + + callback(null, data.equals(res.body)) + }) }) - }) + } else { + console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.') + callback(null, true) + } } function uploadVideo (url, accessToken, name, description, tags, fixture, specialStatus, end) {