mirror of
https://github.com/element-hq/element-web
synced 2024-11-28 04:21:57 +03:00
Merge pull request #26 from matrix-org/bwindels/disablelltests
disable LL tests on travis CI
This commit is contained in:
commit
64608af0b2
3 changed files with 15 additions and 5 deletions
2
run.sh
2
run.sh
|
@ -15,5 +15,5 @@ trap 'handle_error' ERR
|
|||
|
||||
./synapse/start.sh
|
||||
./riot/start.sh
|
||||
node start.js
|
||||
node start.js $@
|
||||
stop_servers
|
||||
|
|
|
@ -22,7 +22,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) {
|
||||
module.exports = async function scenario(createSession, restCreator, runningOnTravis) {
|
||||
async function createUser(username) {
|
||||
const session = await createSession(username);
|
||||
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 bob = await createUser("bob");
|
||||
const charlies = await createRestUsers(restCreator);
|
||||
|
||||
await roomDirectoryScenarios(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) {
|
||||
|
|
3
start.js
3
start.js
|
@ -26,6 +26,7 @@ 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';
|
||||
|
@ -58,7 +59,7 @@ async function runTests() {
|
|||
|
||||
let failure = false;
|
||||
try {
|
||||
await scenario(createSession, restCreator);
|
||||
await scenario(createSession, restCreator, program.travis);
|
||||
} catch(err) {
|
||||
failure = true;
|
||||
console.log('failure: ', err);
|
||||
|
|
Loading…
Reference in a new issue