aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-07-29 11:59:29 +0200
committerChocobozzz <me@florianbigard.com>2019-07-29 13:40:39 +0200
commit2284f202070aa2e49156cc52b3b1596a7d5aadec (patch)
tree77aeb00016734667f8ff32a98ea8b4a6ed3ca31e /shared
parent112be80ebdf96ef6a27420c1c6a10097388731a9 (diff)
downloadPeerTube-2284f202070aa2e49156cc52b3b1596a7d5aadec.tar.gz
PeerTube-2284f202070aa2e49156cc52b3b1596a7d5aadec.tar.zst
PeerTube-2284f202070aa2e49156cc52b3b1596a7d5aadec.zip
Add gitlab ci support
Diffstat (limited to 'shared')
-rw-r--r--shared/extra-utils/miscs/miscs.ts10
-rw-r--r--shared/extra-utils/miscs/sql.ts3
-rw-r--r--shared/extra-utils/server/jobs.ts5
-rw-r--r--shared/extra-utils/server/servers.ts4
4 files changed, 13 insertions, 9 deletions
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
index 42250886c..08f41a7e7 100644
--- a/shared/extra-utils/miscs/miscs.ts
+++ b/shared/extra-utils/miscs/miscs.ts
@@ -1,10 +1,10 @@
1/* tslint:disable:no-unused-expression */ 1/* tslint:disable:no-unused-expression */
2 2
3import * as chai from 'chai' 3import * as chai from 'chai'
4import { basename, isAbsolute, join, resolve } from 'path' 4import { basename, dirname, isAbsolute, join, resolve } from 'path'
5import * as request from 'supertest' 5import * as request from 'supertest'
6import * as WebTorrent from 'webtorrent' 6import * as WebTorrent from 'webtorrent'
7import { pathExists, readFile } from 'fs-extra' 7import { ensureDir, pathExists, readFile } from 'fs-extra'
8import * as ffmpeg from 'fluent-ffmpeg' 8import * as ffmpeg from 'fluent-ffmpeg'
9 9
10const expect = chai.expect 10const expect = chai.expect
@@ -59,12 +59,12 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
59 expect(data.length).to.be.below(maxLength) 59 expect(data.length).to.be.below(maxLength)
60} 60}
61 61
62function buildAbsoluteFixturePath (path: string, customTravisPath = false) { 62function buildAbsoluteFixturePath (path: string, customCIPath = false) {
63 if (isAbsolute(path)) { 63 if (isAbsolute(path)) {
64 return path 64 return path
65 } 65 }
66 66
67 if (customTravisPath && process.env.TRAVIS) return join(process.env.HOME, 'fixtures', path) 67 if (customCIPath && process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path)
68 68
69 return join(root(), 'server', 'tests', 'fixtures', path) 69 return join(root(), 'server', 'tests', 'fixtures', path)
70} 70}
@@ -72,6 +72,8 @@ function buildAbsoluteFixturePath (path: string, customTravisPath = false) {
72async function generateHighBitrateVideo () { 72async function generateHighBitrateVideo () {
73 const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true) 73 const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
74 74
75 await ensureDir(dirname(tempFixturePath))
76
75 const exists = await pathExists(tempFixturePath) 77 const exists = await pathExists(tempFixturePath)
76 if (!exists) { 78 if (!exists) {
77 79
diff --git a/shared/extra-utils/miscs/sql.ts b/shared/extra-utils/miscs/sql.ts
index 1961a8762..dfe840d8c 100644
--- a/shared/extra-utils/miscs/sql.ts
+++ b/shared/extra-utils/miscs/sql.ts
@@ -1,6 +1,5 @@
1import { QueryTypes, Sequelize } from 'sequelize' 1import { QueryTypes, Sequelize } from 'sequelize'
2import { ServerInfo } from '../server/servers' 2import { ServerInfo } from '../server/servers'
3import { PluginType } from '../../models/plugins/plugin.type'
4 3
5let sequelizes: { [ id: number ]: Sequelize } = {} 4let sequelizes: { [ id: number ]: Sequelize } = {}
6 5
@@ -10,7 +9,7 @@ function getSequelize (internalServerNumber: number) {
10 const dbname = 'peertube_test' + internalServerNumber 9 const dbname = 'peertube_test' + internalServerNumber
11 const username = 'peertube' 10 const username = 'peertube'
12 const password = 'peertube' 11 const password = 'peertube'
13 const host = 'localhost' 12 const host = process.env.GITLAB_CI ? 'postgres' : 'localhost'
14 const port = 5432 13 const port = 5432
15 14
16 const seq = new Sequelize(dbname, username, password, { 15 const seq = new Sequelize(dbname, username, password, {
diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index 692b5e24d..11b570f60 100644
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
@@ -2,6 +2,7 @@ import * as request from 'supertest'
2import { Job, JobState } from '../../models' 2import { Job, JobState } from '../../models'
3import { wait } from '../miscs/miscs' 3import { wait } from '../miscs/miscs'
4import { ServerInfo } from './servers' 4import { ServerInfo } from './servers'
5import { inspect } from 'util'
5 6
6function getJobsList (url: string, accessToken: string, state: JobState) { 7function getJobsList (url: string, accessToken: string, state: JobState) {
7 const path = '/api/v1/jobs/' + state 8 const path = '/api/v1/jobs/' + state
@@ -49,7 +50,9 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
49 .then(res => res.body.data) 50 .then(res => res.body.data)
50 .then((jobs: Job[]) => jobs.filter(j => j.type !== 'videos-views')) 51 .then((jobs: Job[]) => jobs.filter(j => j.type !== 'videos-views'))
51 .then(jobs => { 52 .then(jobs => {
52 if (jobs.length !== 0) pendingRequests = true 53 if (jobs.length !== 0) {
54 pendingRequests = true
55 }
53 }) 56 })
54 tasks.push(p) 57 tasks.push(p)
55 } 58 }
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 40cf7f0f3..a0720d778 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -79,8 +79,8 @@ function flushTests (serverNumber?: number) {
79 return new Promise<void>((res, rej) => { 79 return new Promise<void>((res, rej) => {
80 const suffix = serverNumber ? ` -- ${serverNumber}` : '' 80 const suffix = serverNumber ? ` -- ${serverNumber}` : ''
81 81
82 return exec('npm run clean:server:test' + suffix, err => { 82 return exec('npm run clean:server:test' + suffix, (err, _stdout, stderr) => {
83 if (err) return rej(err) 83 if (err || stderr) return rej(err || new Error(stderr))
84 84
85 return res() 85 return res()
86 }) 86 })