diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
| commit | 73b3aa6429dfb2e31628fa09a479dce318289d7d (patch) | |
| tree | 88cf5c7c49ba89c18633a4a64a4acfc8d40b4a50 /server/tests/api/travis-2.sh | |
| parent | fd822c1c699fb89bb1c3218e047e1d842bc1ba1a (diff) | |
| parent | 618750486ee2732e0ad3525349e4d42f29e1803e (diff) | |
| download | PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.gz PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.zst PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.zip | |
Merge branch 'feature/audio-upload' into develop
Diffstat (limited to 'server/tests/api/travis-2.sh')
| -rw-r--r-- | server/tests/api/travis-2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tests/api/travis-2.sh b/server/tests/api/travis-2.sh index 82c1864b4..ba7a061b0 100644 --- a/server/tests/api/travis-2.sh +++ b/server/tests/api/travis-2.sh | |||
| @@ -5,5 +5,5 @@ set -eu | |||
| 5 | serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) | 5 | serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) |
| 6 | usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) | 6 | usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) |
| 7 | 7 | ||
| 8 | MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ | 8 | MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ |
| 9 | $serverFiles $usersFiles | 9 | $serverFiles $usersFiles |