From da3a3ab6829107b3ed7f18dda42648dfde41871d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 25 Apr 2019 09:46:02 +0200
Subject: Try parallel check params tests

---
 server/tests/api/index-1.ts                                  |  3 ---
 server/tests/api/notifications/index.ts                      |  2 +-
 server/tests/api/search/search-activitypub-video-channels.ts |  2 +-
 server/tests/api/search/search-activitypub-videos.ts         |  2 +-
 server/tests/api/search/search-videos.ts                     |  2 +-
 server/tests/api/travis-1.sh                                 | 10 ++++++++++
 6 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 server/tests/api/index-1.ts
 create mode 100644 server/tests/api/travis-1.sh

(limited to 'server')

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 @@
-import './check-params'
-import './notifications'
-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-
 
 const expect = chai.expect
 
-describe('Test a ActivityPub video channels search', function () {
+describe('Test ActivityPub video channels search', function () {
   let servers: ServerInfo[]
   let userServer2Token: string
   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'
 
 const expect = chai.expect
 
-describe('Test a ActivityPub videos search', function () {
+describe('Test ActivityPub videos search', function () {
   let servers: ServerInfo[]
   let videoServer1UUID: string
   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 {
 
 const expect = chai.expect
 
-describe('Test a videos search', function () {
+describe('Test videos search', function () {
   let server: ServerInfo = null
   let startDate: string
 
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 @@
+#!/usr/bin/env sh
+
+set -eu
+
+files=$(find server/tests/api/check-params -type f | grep -v index.ts | xargs echo)
+
+MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel 4 --timeout 5000 --exit --require ts-node/register --bail $files
+
+mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/notifications/index.ts
+mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/search/index.ts
-- 
cgit v1.2.3