diff --git a/src/scenario.js b/src/scenario.js index 5b9d1f2906..4593960c10 100644 --- a/src/scenario.js +++ b/src/scenario.js @@ -21,7 +21,7 @@ const roomDirectoryScenarios = require('./scenarios/directory'); const lazyLoadingScenarios = require('./scenarios/lazy-loading'); const e2eEncryptionScenarios = require('./scenarios/e2e-encryption'); -module.exports = async function scenario(createSession, restCreator, runningOnTravis) { +module.exports = async function scenario(createSession, restCreator) { async function createUser(username) { const session = await createSession(username); await signup(session, session.username, 'testtest', session.hsUrl); @@ -34,16 +34,8 @@ module.exports = async function scenario(createSession, restCreator, runningOnTr await roomDirectoryScenarios(alice, bob); await e2eEncryptionScenarios(alice, bob); - // 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); - } + const charlies = await createRestUsers(restCreator); + await lazyLoadingScenarios(alice, bob, charlies); } async function createRestUsers(restCreator) { diff --git a/start.js b/start.js index 18ccb438ec..1c3f27bbe3 100644 --- a/start.js +++ b/start.js @@ -26,7 +26,6 @@ program .option('--windowed', "dont run tests headless", false) .option('--slow-mo', "run tests slower to follow whats going on", 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); const hsUrl = 'http://localhost:5005'; @@ -59,7 +58,7 @@ async function runTests() { let failure = false; try { - await scenario(createSession, restCreator, program.travis); + await scenario(createSession, restCreator); } catch(err) { failure = true; console.log('failure: ', err);