Skip to content

Commit f58ecb8

Browse files
committed
fix(tests): use 10kb files for the test and update validation
1 parent 069cab2 commit f58ecb8

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

packages/e2e-tests/test/e2e.spec.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,10 +1722,10 @@ describe('e2e', function () {
17221722
});
17231723
});
17241724

1725-
describe('with custom log retention days', function () {
1725+
describe('with logRetentionDays', function () {
17261726
const customLogDir = useTmpdir();
17271727

1728-
it('should delete older files according to the setting', async function () {
1728+
it('should delete older files older than logRetentionDays', async function () {
17291729
const paths: string[] = [];
17301730
const today = Math.floor(Date.now() / 1000);
17311731
const tenDaysAgo = today - 10 * 24 * 60 * 60;
@@ -1776,10 +1776,10 @@ describe('e2e', function () {
17761776
});
17771777
});
17781778

1779-
describe('with custom log retention max file count', function () {
1779+
describe('with logMaxFileCount', function () {
17801780
const customLogDir = useTmpdir();
17811781

1782-
it('should delete files once it is above the max file count limit', async function () {
1782+
it('should delete files once it is above logMaxFileCount', async function () {
17831783
const globalConfig = path.join(homedir, 'globalconfig.conf');
17841784
await fs.writeFile(
17851785
globalConfig,
@@ -1825,28 +1825,28 @@ describe('e2e', function () {
18251825
});
18261826
});
18271827

1828-
describe('with custom log retention max logs size', function () {
1828+
describe('with logRetentionGB', function () {
18291829
const customLogDir = useTmpdir();
18301830

1831-
it('should delete files once it is above the logs retention GB', async function () {
1831+
it('should delete files once it is above logRetentionGB', async function () {
18321832
const globalConfig = path.join(homedir, 'globalconfig.conf');
18331833
await fs.writeFile(
18341834
globalConfig,
1835-
// Set logRetentionGB to 4 KB
1835+
// Set logRetentionGB to 40 KB and we will create prior 10 log files, 10 KB each
18361836
`mongosh:\n logLocation: ${JSON.stringify(
18371837
customLogDir.path
1838-
)}\n logRetentionGB: ${4 / 1024 / 1024}`
1838+
)}\n logRetentionGB: ${40 / 1024 / 1024}`
18391839
);
18401840
const paths: string[] = [];
18411841
const offset = Math.floor(Date.now() / 1000);
18421842

1843-
// Create 10 log files, 1kb each
1843+
// Create 10 log files, 10kb each
18441844
for (let i = 9; i >= 0; i--) {
18451845
const filename = path.join(
18461846
customLogDir.path,
18471847
ObjectId.createFromTime(offset - i).toHexString() + '_log'
18481848
);
1849-
await fs.writeFile(filename, '0'.repeat(1024));
1849+
await fs.writeFile(filename, '0'.repeat(1024 * 10));
18501850
paths.push(filename);
18511851
}
18521852

@@ -1868,10 +1868,11 @@ describe('e2e', function () {
18681868

18691869
expect(
18701870
await shell.executeLine('config.get("logRetentionGB")')
1871-
).contains(`${4 / 1024 / 1024}`);
1871+
).contains(`${40 / 1024 / 1024}`);
18721872

1873-
// Expect 6 files to be deleted and 5 to remain (including the new log file)
1874-
expect(await getFilesState(paths)).to.equal('00000011111');
1873+
// Expect 6 files to be deleted and 4 to remain
1874+
// (including the new log file which should be <10 kb)
1875+
expect(await getFilesState(paths)).to.equal('00000001111');
18751876
});
18761877
});
18771878

packages/types/src/index.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ describe('config validation', function () {
3939
);
4040
expect(await validate('logRetentionGB', undefined)).to.equal(null);
4141
expect(await validate('logRetentionGB', 100)).to.equal(null);
42-
expect(await validate('logRetentionDays', -1)).to.equal(
43-
'logRetentionGB must be a positive integer'
44-
);
4542
expect(await validate('logMaxFileCount', 'foo')).to.equal(
4643
'logMaxFileCount must be a positive integer'
4744
);

0 commit comments

Comments
 (0)