PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

remove travis flag

Browse source
This commit is contained in:
Bruno Windels 2019-04-02 15:14:44 +02:00
parent f197e9f977
commit 450430d66c
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/scenario.js
View file

@ -21,7 +21,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, runningOnTravis) { module.exports = async function scenario(createSession, restCreator) {
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);
@ -34,17 +34,9 @@ module.exports = async function scenario(createSession, restCreator, runningOnTr
await roomDirectoryScenarios(alice, bob); await roomDirectoryScenarios(alice, bob);
await e2eEncryptionScenarios(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); const charlies = await createRestUsers(restCreator);
await lazyLoadingScenarios(alice, bob, charlies); await lazyLoadingScenarios(alice, bob, charlies);
} }
}
async function createRestUsers(restCreator) { async function createRestUsers(restCreator) {
const usernames = range(1, 10).map((i) => `charly-${i}`); const usernames = range(1, 10).map((i) => `charly-${i}`);

3
start.js
View file

@ -26,7 +26,6 @@ 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';
@ -59,7 +58,7 @@ async function runTests() {
let failure = false; let failure = false;
try { try {
await scenario(createSession, restCreator, program.travis); await scenario(createSession, restCreator);
} catch(err) { } catch(err) {
failure = true; failure = true;
console.log('failure: ', err); console.log('failure: ', err);