Merge pull request #51 from matrix-org/bwindels/fixsynapseinstallation2

adjust path to register script for pip installation
This commit is contained in:
David Baker 2019-06-24 14:04:22 +01:00 committed by GitHub
commit c76dc87412
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -59,12 +59,12 @@ module.exports = class RestSessionCreator {
'--no-admin', '--no-admin',
this.hsUrl this.hsUrl
]; ];
const registerCmd = `./scripts/register_new_matrix_user ${registerArgs.join(' ')}`; const registerCmd = `./register_new_matrix_user ${registerArgs.join(' ')}`;
const allCmds = [ const allCmds = [
`cd ${this.synapseSubdir}`, `cd ${this.synapseSubdir}`,
". env/bin/activate", ". activate",
registerCmd registerCmd
].join('&&'); ].join(' && ');
await execAsync(allCmds, {cwd: this.cwd, encoding: 'utf-8'}); await execAsync(allCmds, {cwd: this.cwd, encoding: 'utf-8'});
} }

View file

@ -52,7 +52,7 @@ async function runTests() {
} }
const restCreator = new RestSessionCreator( const restCreator = new RestSessionCreator(
'synapse/installations/consent', 'synapse/installations/consent/env/bin',
hsUrl, hsUrl,
__dirname __dirname
); );