mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 07:33:12 +09:00
Merge remote-tracking branch 'origin/master' into host-pairing
# Conflicts: # packages/host/host.ts
This commit is contained in:
21 files changed
+63
-29
No files matched your search
@@ -169,7 +169,9 @@ describe("Integration of lib/link", function() {
|
||||
|
||||
it("should close old connections from the same address", async function() {
|
||||
slowTest(this);
|
||||
const hostConnectorFirst = new TestHostConnector(url, 0.2);
|
||||
// Without a link the disconnect prepare goes unanswered and the controller waits 10 s for it
|
||||
const hostLinkFirst = new lib.Link(new TestHostConnector(url, 0.2));
|
||||
const hostConnectorFirst = hostLinkFirst.connector;
|
||||
hostConnectorFirst.token = hostConnector.token;
|
||||
hostConnectorFirst.hostId = hostConnector.hostId;
|
||||
const onceClose = events.once(hostConnectorFirst, "close");
|
||||
|
||||
Reference in new issue
Block a user