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.

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

merge v5.4 -> V6.0 #457

Merged
merged 9 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Documents/Session/InMemoryDocumentSessionOperations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ export abstract class InMemoryDocumentSessionOperations
this._rememberEntityForDocumentIdGeneration(entity);
}
} else {
this.generateEntityIdOnTheClient.trySetIdentity(entity, id);
this._generateEntityIdOnTheClient.trySetIdentity(entity, id);
}

const cmdKey = IdTypeAndName.keyFor(id, "ClientAnyCommand", null);
Expand Down
13 changes: 8 additions & 5 deletions test/Ported/Server/Replication/PullReplicationTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ import { delay } from "../../../../src/Utility/PromiseUtil.js";
const definitionName1 = "pull-replication" + hub.database;
const definitionName2 = "pull-replication" + hub2.database;

const timeout = 3_000;
const timeout = 15_000;

await hub.maintenance.forDatabase(hub.database).send(new PutPullReplicationAsHubOperation(definitionName1));
await hub2.maintenance.forDatabase(hub2.database).send(new PutPullReplicationAsHubOperation(definitionName2));
Expand All @@ -242,7 +242,8 @@ import { delay } from "../../../../src/Utility/PromiseUtil.js";
connectionStringName: "ConnectionString2-" + sink.database,
hubName: definitionName2,
taskId: pullTasks[0].taskId,
mode: "HubToSink"
mode: "HubToSink",
url: sink.urls[0]
};

await ReplicationTestContext.addWatcherToReplicationTopology(sink, pull, ...hub2.urls);
Expand Down Expand Up @@ -350,7 +351,7 @@ import { delay } from "../../../../src/Utility/PromiseUtil.js";
hub = await testContext.getDocumentStore();

const definitionName = "pull-replication" + hub.database;
const timeout = 10_000;
const timeout = 15_000;

await hub.maintenance.forDatabase(hub.database)
.send(new PutPullReplicationAsHubOperation(definitionName));
Expand All @@ -371,7 +372,8 @@ import { delay } from "../../../../src/Utility/PromiseUtil.js";
hubName: definitionName,
disabled: true,
taskId: pullTasks[0].taskId,
mode: "HubToSink"
mode: "HubToSink",
url: sink.urls[0],
};

await ReplicationTestContext.addWatcherToReplicationTopology(sink, pull, ...hub.urls);
Expand Down Expand Up @@ -517,7 +519,8 @@ async function setupPullReplication(remoteName: string, sink: IDocumentStore, ..
database: store.database,
connectionStringName: "ConnectionString-" + store.database,
hubName: remoteName,
mode: "HubToSink"
mode: "HubToSink",
url: sink.urls[0],
};

resList.push(await ReplicationTestContext.addWatcherToReplicationTopology(sink, pull, ...store.urls));
Expand Down