OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix tests

pull/5338/head
Chocobozzz 2022-10-04 13:57:56 +02:00
parent e37ca6cbc7
commit 7dd7ff4ceb
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/tests/api/redundancy/redundancy.ts
View File

@ -5,7 +5,7 @@ import { readdir } from 'fs-extra'
import magnetUtil from 'magnet-uri'
import { basename, join } from 'path'
import { checkSegmentHash, checkVideoFilesWereRemoved, saveVideoInServers } from '@server/tests/shared'
import { root, wait } from '@shared/core-utils'
import { wait } from '@shared/core-utils'
import {
HttpStatusCode,
VideoDetails,
@ -164,7 +164,7 @@ async function check2Webseeds (videoUUID?: string) {
]
for (const directory of directories) {
const files = await readdir(join(root(), directory))
const files = await readdir(directory)
expect(files).to.have.length.at.least(4)
// Ensure we files exist on disk
@ -219,7 +219,7 @@ async function check1PlaylistRedundancies (videoUUID?: string) {
]
for (const directory of directories) {
const files = await readdir(join(root(), directory, videoUUID))
const files = await readdir(join(directory, videoUUID))
expect(files).to.have.length.at.least(4)
// Ensure we files exist on disk

7
shared/server-commands/requests/requests.ts
View File

@ -134,7 +134,12 @@ function unwrapText (test: request.Test): Promise<string> {
function unwrapBodyOrDecodeToJSON <T> (test: request.Test): Promise<T> {
return test.then(res => {
if (res.body instanceof Buffer) {
return JSON.parse(new TextDecoder().decode(res.body))
try {
return JSON.parse(new TextDecoder().decode(res.body))
} catch (err) {
console.error('Cannot decode JSON.', res.body)
throw err
}
}
return res.body