mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 12:45:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from matrix-org/bwindels/disablelltests

Browse source 
disable LL tests on travis CI
This commit is contained in:
Bruno Windels 2018-09-19 11:04:55 +02:00 committed by GitHub
commit 64608af0b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
run.sh
View file

@ -15,5 +15,5 @@ trap 'handle_error' ERR
./synapse/start.sh ./synapse/start.sh
./riot/start.sh ./riot/start.sh
node start.js node start.js $@
stop_servers stop_servers

15
src/scenario.js
View file

@ -22,7 +22,7 @@ const roomDirectoryScenarios = require('./scenarios/directory');
const lazyLoadingScenarios = require('./scenarios/lazy-loading'); const lazyLoadingScenarios = require('./scenarios/lazy-loading');
const e2eEncryptionScenarios = require('./scenarios/e2e-encryption'); const e2eEncryptionScenarios = require('./scenarios/e2e-encryption');
module.exports = async function scenario(createSession, restCreator) { module.exports = async function scenario(createSession, restCreator, runningOnTravis) {
async function createUser(username) { async function createUser(username) {
const session = await createSession(username); const session = await createSession(username);
await signup(session, session.username, 'testtest', session.hsUrl); await signup(session, session.username, 'testtest', session.hsUrl);
@ -32,11 +32,20 @@ module.exports = async function scenario(createSession, restCreator) {
const alice = await createUser("alice"); const alice = await createUser("alice");
const bob = await createUser("bob"); const bob = await createUser("bob");
const charlies = await createRestUsers(restCreator);
await roomDirectoryScenarios(alice, bob); await roomDirectoryScenarios(alice, bob);
await e2eEncryptionScenarios(alice, bob); await e2eEncryptionScenarios(alice, bob);
await lazyLoadingScenarios(alice, bob, charlies);
// disable LL tests until we can run synapse on anything > than 2.7.7 as
// /admin/register fails with a missing method.
// either switch to python3 on synapse,
// blocked on https://github.com/matrix-org/synapse/issues/3900
// or use a more recent version of ubuntu
// or switch to circleci?
if (!runningOnTravis) {
const charlies = await createRestUsers(restCreator);
await lazyLoadingScenarios(alice, bob, charlies);
}
} }
async function createRestUsers(restCreator) { async function createRestUsers(restCreator) {

3
start.js
View file

@ -26,6 +26,7 @@ program
.option('--windowed', "dont run tests headless", false) .option('--windowed', "dont run tests headless", false)
.option('--slow-mo', "run tests slower to follow whats going on", false) .option('--slow-mo', "run tests slower to follow whats going on", false)
.option('--dev-tools', "open chrome devtools in browser window", false) .option('--dev-tools', "open chrome devtools in browser window", false)
.option('--travis', "running on travis CI, disable tests known to break on Ubuntu 14.04 LTS", false)
.parse(process.argv); .parse(process.argv);
const hsUrl = 'http://localhost:5005'; const hsUrl = 'http://localhost:5005';
@ -58,7 +59,7 @@ async function runTests() {
let failure = false; let failure = false;
try { try {
await scenario(createSession, restCreator); await scenario(createSession, restCreator, program.travis);
} catch(err) { } catch(err) {
failure = true; failure = true;
console.log('failure: ', err); console.log('failure: ', err);