digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Use sandbox '--port-file' (#5284)

Browse Source 
* increase timeout to eternal

changelog_begin
changelog_end

* Switch to using --port-file for sandbox

changelog_begin
changelog_end
This commit is contained in:
Shayne Fletcher 2020-03-30 15:24:42 -04:00 committed by GitHub
parent 2722e7ce95
commit de03006470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
language-support/ts/codegen/tests/ts/build-and-lint-test/src/__tests__/test.ts
View File

@ -24,6 +24,7 @@ const BOB_PARTY = 'Bob';
const BOB_TOKEN = computeToken(BOB_PARTY);
const SANDBOX_PORT = 6865;
const SANDBOX_PORT_FILE = 'sandbox.port';
const JSON_API_PORT = 7575;
const HTTP_BASE_URL = `http://localhost:${JSON_API_PORT}/`;
@ -38,26 +39,26 @@ const getEnv = (variable: string): string => {
return result;
}
const spawnJvmAndWaitOnPort = async (jar: string, args: string[], port: number): Promise<ChildProcess> => {
const spawnJvmAndWaitOn = async (jar: string, args: string[], resource: string): Promise<ChildProcess> => {
const java = getEnv('JAVA');
const proc = spawn(java, ['-jar', jar, ...args], {stdio: "inherit",});
await waitOn({resources: [`tcp:localhost:${port}`]})
await waitOn({resources: [resource]})
return proc;
}
beforeAll(async () => {
console.log ('build-and-lint-1.0.0 (' + buildAndLint.packageId + ") loaded");
const darPath = getEnv('DAR');
sandboxProcess = await spawnJvmAndWaitOnPort(
sandboxProcess = await spawnJvmAndWaitOn(
getEnv('SANDBOX'),
['--port', `${SANDBOX_PORT}`, '--ledgerid', LEDGER_ID, '--wall-clock-time', darPath],
SANDBOX_PORT,
['--port', `${SANDBOX_PORT}`, '--port-file', SANDBOX_PORT_FILE, '--ledgerid', LEDGER_ID, '--wall-clock-time', darPath],
`file:${SANDBOX_PORT_FILE}`,
);
console.log('Sandbox up');
jsonApiProcess = await spawnJvmAndWaitOnPort(
jsonApiProcess = await spawnJvmAndWaitOn(
getEnv('JSON_API'),
['--ledger-host', 'localhost', '--ledger-port', `${SANDBOX_PORT}`,'--http-port', `${JSON_API_PORT}`, '--websocket-config', 'heartBeatPer=1'],
JSON_API_PORT,
`tcp:localhost:${JSON_API_PORT}`,
)
console.log('JSON API up');
});