Skip to content

Commit 5615062

Browse files
committed
fix: test automerge separately
1 parent 721736a commit 5615062

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

packages/shell-api/src/helpers.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ describe('getPrintableShardStatus', function () {
224224
);
225225
expect(status['most recently active mongoses']).to.have.lengthOf(1);
226226
expect(status.autosplit['Currently enabled']).to.equal('yes');
227-
expect((status.automerge ?? {})['Currently enabled']).to.equal('yes');
228227
expect(status.balancer['Currently enabled']).to.equal('yes');
229228
expect(
230229
status.balancer['Failed balancer rounds in last 5 attempts']

packages/shell-api/src/shard.spec.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,7 +2419,6 @@ describe('Shard', function () {
24192419
'shardingVersion',
24202420
'shards',
24212421
'autosplit',
2422-
'automerge',
24232422
'balancer',
24242423
'databases',
24252424
]);
@@ -2464,12 +2463,23 @@ describe('Shard', function () {
24642463
'shardingVersion',
24652464
'shards',
24662465
'autosplit',
2467-
'automerge',
24682466
'balancer',
24692467
'databases',
24702468
]);
24712469
});
24722470
});
2471+
describe('with a 7.0+ server', function () {
2472+
skipIfServerVersion(mongos, '< 7.0');
2473+
2474+
it('displays automerge status, if explicitly set', async function () {
2475+
await sh.startAutoMerger();
2476+
const result = await sh.status();
2477+
2478+
expect(result.value.automerge).to.deep.equal({
2479+
'Currently enabled': 'yes',
2480+
});
2481+
});
2482+
});
24732483
});
24742484
describe('turn on sharding', function () {
24752485
it('enableSharding for a db', async function () {

0 commit comments

Comments
 (0)