Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(test-tooling): fix WS identity server port publish configuration #3416

Merged
merged 1 commit into from
Jul 17, 2024
Merged

test(test-tooling): fix WS identity server port publish configuration #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ describe("PluginLedgerConnectorFabric", () => {
logLevel,
});

await ledger.start({ omitPull: false });

wsTestContainer = new WsTestServer({});
await wsTestContainer.start();

const ci = await Containers.getById(wsTestContainer.containerId);
const wsIpAddr = await internalIpV4();
const hostPort = await Containers.getPublicPort(WS_IDENTITY_HTTP_PORT, ci);

await ledger.start({ omitPull: false });

const connectionProfile = await ledger.getConnectionProfileOrg1();
expect(connectionProfile).toBeTruthy();

const keychainInstanceId = uuidv4();
keychainId = uuidv4();

const ci = await Containers.getById(wsTestContainer.containerId);
const wsIpAddr = await internalIpV4();
const hostPort = await Containers.getPublicPort(WS_IDENTITY_HTTP_PORT, ci);

const wsUrl = `http://${wsIpAddr}:${hostPort}`;

const wsConfig: IWebSocketConfig = {
Expand Down
6 changes: 3 additions & 3 deletions packages/cactus-test-tooling/src/main/typescript/ws-test-server/ws-test-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ export class WsTestServer {
// to docker container's IP addresses directly...
// https://stackoverflow.com/a/39217691
PublishAllPorts: true,
/*Env: [`WS_IDENTITY_PATH=${WS_IDENTITY_PATH}`, ...this.envVars],
/*Env: [`WS_IDENTITY_PATH=${WS_IDENTITY_PATH}`, ...this.envVars],*/
HostConfig: {
// NetworkMode: "host",
CapAdd: ["IPC_LOCK"],
// CapAdd: ["IPC_LOCK"],
PublishAllPorts: true,
},*/
},
//Healthcheck: {
// Test: ["CMD-SHELL", "wget -O- http://127.0.0.1:8200/v1/sys/health"],
// Interval: 100 * 1000000,
Expand Down
Loading