Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit bee1077

Browse files
authored
Merge pull request #891 from fluent-ffmpeg/fix/tests
fix: update tested node versions and ffmpeg url
2 parents 9cc9c49 + 8f386cd commit bee1077

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ before_install:
55
matrix:
66
include:
77
- os: linux
8-
env: NODE_VERSION=4
8+
env: NODE_VERSION=8
99
- os: linux
10-
env: NODE_VERSION=5
10+
env: NODE_VERSION=10
1111
- os: linux
12-
env: NODE_VERSION=6
12+
env: NODE_VERSION=11
1313
script:
1414
- tools/test-travis.sh
1515
addons:
1616
apt:
1717
packages:
18-
- wget
19-
- tar
20-
- bzip2
18+
- wget
19+
- tar
20+
- bzip2

test/processor.test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ describe('Processor', function() {
770770
})
771771
.saveToFile(testFile);
772772
});
773-
773+
774774
it('should pass input stream errors through to error handler', function(done) {
775775
var testFile = path.join(__dirname, 'assets', 'testConvertFromStream.avi')
776776

@@ -780,12 +780,12 @@ describe('Processor', function() {
780780
process.nextTick(() => this.emit('error', readError))
781781
}
782782
})
783-
783+
784784
const command = this.getCommand({ source: instream, logger: testhelper.logger })
785785

786786
let startCalled = false
787787
const self = this
788-
788+
789789
command
790790
.usingPreset('divx')
791791
.on('start', function() {
@@ -953,21 +953,21 @@ describe('Processor', function() {
953953
new FfmpegCommand().writeToStream({end: true});
954954
}).should.throw(/PassThrough stream is not supported on node v0.8/);
955955
});
956-
956+
957957
it('should pass output stream errors through to error handler', function(done) {
958-
958+
959959
const writeError = new Error('Write Error')
960960
const outstream = new (require('stream').Writable)({
961961
write(chunk, encoding, callback) {
962962
callback(writeError)
963963
}
964964
})
965-
965+
966966
const command = this.getCommand({ source: this.testfile, logger: testhelper.logger })
967967

968968
let startCalled = false
969969
const self = this
970-
970+
971971
command
972972
.usingPreset('divx')
973973
.on('start', function() {
@@ -1076,7 +1076,7 @@ describe('Processor', function() {
10761076
});
10771077
});
10781078

1079-
describe('Remote I/O', function() {
1079+
describe.skip('Remote I/O', function() {
10801080
this.timeout(60000);
10811081

10821082
var ffserver;

tools/test-travis.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ set -e
77

88
echo travis_fold:start:Dependencies
99

10-
wget http://johnvansickle.com/ffmpeg/builds/ffmpeg-git-64bit-static.tar.xz
11-
tar xf ffmpeg-git-64bit-static.tar.xz
10+
wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
11+
tar xf ffmpeg-release-amd64-static.tar.xz
1212

1313
mkdir -p $HOME/bin
14-
cp ffmpeg-git-*-static/{ffmpeg,ffprobe,ffserver} $HOME/bin
15-
cp ffmpeg-git-*-static/{ffmpeg,ffprobe} $(pwd)
14+
cp ffmpeg-*-static/{ffmpeg,ffprobe} $HOME/bin
15+
cp ffmpeg-*-static/{ffmpeg,ffprobe} $(pwd)
1616

1717
export PATH=$(pwd)/bin:$PATH
1818
export ALT_FFMPEG_PATH=$(pwd)/ffmpeg

0 commit comments

Comments
 (0)