From 2284f202070aa2e49156cc52b3b1596a7d5aadec Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 29 Jul 2019 11:59:29 +0200 Subject: Add gitlab ci support --- server/tests/api/activitypub/fetch.ts | 2 +- server/tests/api/ci-1.sh | 10 ++++++++++ server/tests/api/ci-2.sh | 9 +++++++++ server/tests/api/ci-3.sh | 8 ++++++++ server/tests/api/ci-4.sh | 9 +++++++++ server/tests/api/notifications/user-notifications.ts | 4 ++-- server/tests/api/server/email.ts | 2 +- server/tests/api/server/handle-down.ts | 2 +- server/tests/api/server/jobs.ts | 3 ++- server/tests/api/travis-1.sh | 10 ---------- server/tests/api/travis-2.sh | 9 --------- server/tests/api/travis-3.sh | 8 -------- server/tests/api/travis-4.sh | 9 --------- server/tests/api/videos/video-schedule-update.ts | 2 +- 14 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 server/tests/api/ci-1.sh create mode 100644 server/tests/api/ci-2.sh create mode 100644 server/tests/api/ci-3.sh create mode 100644 server/tests/api/ci-4.sh delete mode 100644 server/tests/api/travis-1.sh delete mode 100644 server/tests/api/travis-2.sh delete mode 100644 server/tests/api/travis-3.sh delete mode 100644 server/tests/api/travis-4.sh (limited to 'server/tests') diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index 3a1c0d321..3d54c2042 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts @@ -87,7 +87,7 @@ describe('Test ActivityPub fetcher', function () { }) after(async function () { - this.timeout(10000) + this.timeout(20000) await cleanupTests(servers) diff --git a/server/tests/api/ci-1.sh b/server/tests/api/ci-1.sh new file mode 100644 index 000000000..8dd9756a5 --- /dev/null +++ b/server/tests/api/ci-1.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +set -eu + +checkParamFiles=$(find server/tests/api/check-params -type f | grep -v index.ts | xargs echo) +notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo) +searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo) + +MOCHA_PARALLEL=true npm run mocha --timeout 30000 --exit --require ts-node/register --bail \ + $notificationsFiles $searchFiles $checkParamFiles diff --git a/server/tests/api/ci-2.sh b/server/tests/api/ci-2.sh new file mode 100644 index 000000000..16ab585e9 --- /dev/null +++ b/server/tests/api/ci-2.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +set -eu + +serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) +usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) + +MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit --require ts-node/register --bail \ + $serverFiles $usersFiles diff --git a/server/tests/api/ci-3.sh b/server/tests/api/ci-3.sh new file mode 100644 index 000000000..fc96f6fb4 --- /dev/null +++ b/server/tests/api/ci-3.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +set -eu + +videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) + +MOCHA_PARALLEL=true npm run mocha --timeout 30000 --exit --require ts-node/register --bail \ + $videosFiles diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh new file mode 100644 index 000000000..74809e1ad --- /dev/null +++ b/server/tests/api/ci-4.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +set -eu + +redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) +activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) + +MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit --require ts-node/register --bail \ + $redundancyFiles $activitypubFiles diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts index 662b64e05..6fa630562 100644 --- a/server/tests/api/notifications/user-notifications.ts +++ b/server/tests/api/notifications/user-notifications.ts @@ -782,7 +782,7 @@ describe('Test users notifications', function () { it('Should not send a notification before the video is published', async function () { this.timeout(20000) - let updateAt = new Date(new Date().getTime() + 100000) + let updateAt = new Date(new Date().getTime() + 1000000) const data = { privacy: VideoPrivacy.PRIVATE, @@ -1074,7 +1074,7 @@ describe('Test users notifications', function () { it('Should send unblacklist but not published/subscription notes after unblacklisted if scheduled update pending', async function () { this.timeout(20000) - let updateAt = new Date(new Date().getTime() + 100000) + let updateAt = new Date(new Date().getTime() + 1000000) const name = 'video with auto-blacklist and future schedule ' + uuidv4() diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts index 7b7acfd12..c55a221f2 100644 --- a/server/tests/api/server/email.ts +++ b/server/tests/api/server/email.ts @@ -40,7 +40,7 @@ describe('Test emails', function () { let emailPort: number before(async function () { - this.timeout(30000) + this.timeout(50000) emailPort = await MockSmtpServer.Instance.collectEmails(emails) diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index 068654d8c..a225443c5 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -109,7 +109,7 @@ describe('Test handle downs', function () { }) it('Should remove followers that are often down', async function () { - this.timeout(60000) + this.timeout(240000) // Server 2 and 3 follow server 1 await follow(servers[1].url, [ servers[0].url ], servers[1].accessToken) diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts index 3ab2fe120..ceea47a85 100644 --- a/server/tests/api/server/jobs.ts +++ b/server/tests/api/server/jobs.ts @@ -8,6 +8,7 @@ import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../.. import { flushAndRunMultipleServers } from '../../../../shared/extra-utils/server/servers' import { uploadVideo } from '../../../../shared/extra-utils/videos/videos' import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs' +import { Job } from '../../../../shared/models/server' const expect = chai.expect @@ -50,7 +51,7 @@ describe('Test jobs', function () { if (job.type === 'videos-views') job = res.body.data[1] expect(job.state).to.equal('completed') - expect(job.type).to.equal('activitypub-follow') + expect(job.type.startsWith('activitypub-')).to.be.true expect(dateIsValid(job.createdAt)).to.be.true expect(dateIsValid(job.processedOn)).to.be.true expect(dateIsValid(job.finishedOn)).to.be.true diff --git a/server/tests/api/travis-1.sh b/server/tests/api/travis-1.sh deleted file mode 100644 index db4021b25..000000000 --- a/server/tests/api/travis-1.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -checkParamFiles=$(find server/tests/api/check-params -type f | grep -v index.ts | xargs echo) -notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo) -searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo) - -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ - $notificationsFiles $searchFiles $checkParamFiles diff --git a/server/tests/api/travis-2.sh b/server/tests/api/travis-2.sh deleted file mode 100644 index ba7a061b0..000000000 --- a/server/tests/api/travis-2.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) -usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) - -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ - $serverFiles $usersFiles diff --git a/server/tests/api/travis-3.sh b/server/tests/api/travis-3.sh deleted file mode 100644 index 82457222c..000000000 --- a/server/tests/api/travis-3.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) - -MOCHA_PARALLEL=true mocha --timeout 5000 --exit --require ts-node/register --bail \ - $videosFiles diff --git a/server/tests/api/travis-4.sh b/server/tests/api/travis-4.sh deleted file mode 100644 index 875986182..000000000 --- a/server/tests/api/travis-4.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -set -eu - -redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) -activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) - -MOCHA_PARALLEL=true mocha-parallel-tests --max-parallel $1 --timeout 5000 --exit --require ts-node/register --bail \ - $redundancyFiles $activitypubFiles diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts index 64f657780..65a8eafb8 100644 --- a/server/tests/api/videos/video-schedule-update.ts +++ b/server/tests/api/videos/video-schedule-update.ts @@ -85,7 +85,7 @@ describe('Test video update scheduler', function () { }) it('Should wait some seconds and have the video in public privacy', async function () { - this.timeout(20000) + this.timeout(50000) await wait(15000) await waitJobs(servers) -- cgit v1.2.3