aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-11-17 14:23:52 +0100
committerChocobozzz <me@florianbigard.com>2020-11-17 14:23:52 +0100
commit5c0ecc340ec635baa4549124cc0a055aa0de38f2 (patch)
tree5fbe1e9d0d6620b7936fc13491822563440723ab
parent1648dcb5095061a200a9209d560fc7d5819e777d (diff)
downloadPeerTube-5c0ecc340ec635baa4549124cc0a055aa0de38f2.tar.gz
PeerTube-5c0ecc340ec635baa4549124cc0a055aa0de38f2.tar.zst
PeerTube-5c0ecc340ec635baa4549124cc0a055aa0de38f2.zip
Disable HTTP import in push actions
-rw-r--r--server/tests/cli/peertube.ts9
1 files changed, 8 insertions, 1 deletions
diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index 27fbde02d..e2861f46e 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -2,8 +2,10 @@
2 2
3import 'mocha' 3import 'mocha'
4import { expect } from 'chai' 4import { expect } from 'chai'
5import { Video, VideoDetails } from '../../../shared'
5import { 6import {
6 addVideoChannel, 7 addVideoChannel,
8 areHttpImportTestsDisabled,
7 buildAbsoluteFixturePath, 9 buildAbsoluteFixturePath,
8 cleanupTests, 10 cleanupTests,
9 createUser, 11 createUser,
@@ -21,7 +23,6 @@ import {
21 userLogin, 23 userLogin,
22 waitJobs 24 waitJobs
23} from '../../../shared/extra-utils' 25} from '../../../shared/extra-utils'
24import { Video, VideoDetails } from '../../../shared'
25import { getYoutubeVideoUrl } from '../../../shared/extra-utils/videos/video-imports' 26import { getYoutubeVideoUrl } from '../../../shared/extra-utils/videos/video-imports'
26 27
27describe('Test CLI wrapper', function () { 28describe('Test CLI wrapper', function () {
@@ -112,6 +113,8 @@ describe('Test CLI wrapper', function () {
112 }) 113 })
113 114
114 it('Should import a video', async function () { 115 it('Should import a video', async function () {
116 if (areHttpImportTestsDisabled()) return
117
115 this.timeout(60000) 118 this.timeout(60000)
116 119
117 const env = getEnvCli(server) 120 const env = getEnvCli(server)
@@ -122,6 +125,8 @@ describe('Test CLI wrapper', function () {
122 }) 125 })
123 126
124 it('Should have imported the video', async function () { 127 it('Should have imported the video', async function () {
128 if (areHttpImportTestsDisabled()) return
129
125 this.timeout(60000) 130 this.timeout(60000)
126 131
127 await waitJobs([ server ]) 132 await waitJobs([ server ])
@@ -144,6 +149,8 @@ describe('Test CLI wrapper', function () {
144 }) 149 })
145 150
146 it('Should import and override some imported attributes', async function () { 151 it('Should import and override some imported attributes', async function () {
152 if (areHttpImportTestsDisabled()) return
153
147 this.timeout(60000) 154 this.timeout(60000)
148 155
149 const env = getEnvCli(server) 156 const env = getEnvCli(server)