diff options
Diffstat (limited to 'cypress')
| -rw-r--r-- | cypress/dockerNode.ts | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts index 2c8aa6c5109..a9e8c7c6c45 100644 --- a/cypress/dockerNode.ts +++ b/cypress/dockerNode.ts @@ -136,8 +136,8 @@ export const configureNextcloud = async function() { const hashing = await runExec(container, ['php', 'occ', 'config:system:get', 'hashing_default_password']) console.log('āā Checking APCu configuration... š') - if (!distributed.trim().includes('\\OC\\Memcache\\APCu') - || !local.trim().includes('\\OC\\Memcache\\APCu') + if (!distributed.trim().includes('Memcache\\APCu') + || !local.trim().includes('Memcache\\APCu') || !hashing.trim().includes('true')) { console.log('āā APCu is not properly configured š') throw new Error('APCu is not properly configured') @@ -294,9 +294,14 @@ const runExec = async function( if (stream) { stream.setEncoding('utf-8') stream.on('data', str => { + str = str.trim() + // Remove non printable characters + .replace(/[^\x20-\x7E]+/g, '') + // Remove non alphanumeric leading characters + .replace(/^[^a-z]/gi, '') output += str - if (verbose && str.trim() !== '') { - console.log(`āā ${str.trim().replace(/\n/gi, '\nāā ')}`) + if (verbose && str !== '') { + console.log(`āā ${str.replace(/\n/gi, '\nāā ')}`) } }) stream.on('end', () => resolve(output)) |