diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-25 09:46:02 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-05-14 15:37:42 +0200 |
commit | da3a3ab6829107b3ed7f18dda42648dfde41871d (patch) | |
tree | 0440ec299637afa27b7c965a36ae61a2b8ddb03e /server | |
parent | 56ba489f67474b176ddbba2f5f6247df583c868a (diff) | |
download | PeerTube-da3a3ab6829107b3ed7f18dda42648dfde41871d.tar.gz PeerTube-da3a3ab6829107b3ed7f18dda42648dfde41871d.tar.zst PeerTube-da3a3ab6829107b3ed7f18dda42648dfde41871d.zip |
Try parallel check params tests
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/api/index-1.ts | 3 | ||||
-rw-r--r-- | server/tests/api/notifications/index.ts | 2 | ||||
-rw-r--r-- | server/tests/api/search/search-activitypub-video-channels.ts | 2 | ||||
-rw-r--r-- | server/tests/api/search/search-activitypub-videos.ts | 2 | ||||
-rw-r--r-- | server/tests/api/search/search-videos.ts | 2 | ||||
-rw-r--r-- | server/tests/api/travis-1.sh | 10 |
6 files changed, 14 insertions, 7 deletions
diff --git a/server/tests/api/index-1.ts b/server/tests/api/index-1.ts deleted file mode 100644 index 75cdd9025..000000000 --- a/server/tests/api/index-1.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | import './check-params' | ||
2 | import './notifications' | ||
3 | import './search' | ||
diff --git a/server/tests/api/notifications/index.ts b/server/tests/api/notifications/index.ts index 95ac8fc51..b573f850e 100644 --- a/server/tests/api/notifications/index.ts +++ b/server/tests/api/notifications/index.ts | |||
@@ -1 +1 @@ | |||
export * from './user-notifications' | import './user-notifications' | ||
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts index 4d1ceb767..70a077ffc 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts | |||
@@ -24,7 +24,7 @@ import { searchVideoChannel } from '../../../../shared/extra-utils/search/video- | |||
24 | 24 | ||
25 | const expect = chai.expect | 25 | const expect = chai.expect |
26 | 26 | ||
27 | describe('Test a ActivityPub video channels search', function () { | 27 | describe('Test ActivityPub video channels search', function () { |
28 | let servers: ServerInfo[] | 28 | let servers: ServerInfo[] |
29 | let userServer2Token: string | 29 | let userServer2Token: string |
30 | let videoServer2UUID: string | 30 | let videoServer2UUID: string |
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts index e039961cb..e8e2b5a64 100644 --- a/server/tests/api/search/search-activitypub-videos.ts +++ b/server/tests/api/search/search-activitypub-videos.ts | |||
@@ -22,7 +22,7 @@ import { Video, VideoPrivacy } from '../../../../shared/models/videos' | |||
22 | 22 | ||
23 | const expect = chai.expect | 23 | const expect = chai.expect |
24 | 24 | ||
25 | describe('Test a ActivityPub videos search', function () { | 25 | describe('Test ActivityPub videos search', function () { |
26 | let servers: ServerInfo[] | 26 | let servers: ServerInfo[] |
27 | let videoServer1UUID: string | 27 | let videoServer1UUID: string |
28 | let videoServer2UUID: string | 28 | let videoServer2UUID: string |
diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts index 1a086b33a..22d3a5951 100644 --- a/server/tests/api/search/search-videos.ts +++ b/server/tests/api/search/search-videos.ts | |||
@@ -18,7 +18,7 @@ import { | |||
18 | 18 | ||
19 | const expect = chai.expect | 19 | const expect = chai.expect |
20 | 20 | ||
21 | describe('Test a videos search', function () { | 21 | describe('Test videos search', function () { |
22 | let server: ServerInfo = null | 22 | let server: ServerInfo = null |
23 | let startDate: string | 23 | let startDate: string |
24 | 24 | ||
diff --git a/server/tests/api/travis-1.sh b/server/tests/api/travis-1.sh new file mode 100644 index 000000000..e4761d2f9 --- /dev/null +++ b/server/tests/api/travis-1.sh | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/usr/bin/env sh | ||
2 | |||
3 | set -eu | ||
4 | |||
5 | files=$(find server/tests/api/check-params -type f | grep -v index.ts | xargs echo) | ||
6 | |||
7 | MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel 4 --timeout 5000 --exit --require ts-node/register --bail $files | ||
8 | |||
9 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/notifications/index.ts | ||
10 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/search/index.ts | ||