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

fix some tests by adding delay and moving some tests #1083

Merged
merged 1 commit into from
Mar 20, 2021
Merged

fix some tests by adding delay and moving some tests #1083

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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"scripts": {
"dtslint": "dtslint types",
"lint": "eslint --report-unused-disable-directives --ignore-path .gitignore .",
"mocha": "mocha --exit --timeout 60000",
"mocha": "mocha --exit --timeout 90000",
"test": "npm run lint && npm run mocha"
},
"keywords": [
Expand Down
151 changes: 79 additions & 72 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,10 @@ const runTests = (baseopts) => {

await delay();
await fs_rmdir(testPath);
await delay();
await delay(300);
await write(testPath, 'file content');

await delay(300);
await waitFor([unlinkSpy]);
unlinkSpy.should.have.been.calledWith(testPath);
await waitFor([addSpy]);
Expand Down Expand Up @@ -610,12 +611,13 @@ const runTests = (baseopts) => {
await delay();
await write(safePath, dateNow());
await fs_rename(safePath, testPath);
await delay(100);
await delay(300);
await write(safePath, dateNow());
await fs_rename(safePath, testPath);
await delay(100);
await delay(300);
await write(safePath, dateNow());
await fs_rename(safePath, testPath);
await delay(300);
await waitFor([spy]);
spy.withArgs(EV_CHANGE, testPath).should.have.been.calledThrice;
});
Expand Down Expand Up @@ -1176,13 +1178,14 @@ const runTests = (baseopts) => {
const linkPath = getFixturePath('link');
fs.symlinkSync(getFixturePath('subdir'), linkPath);
const spy = await aspy(chokidar_watch(), EV_ALL);
await delay();
await delay(300);
setTimeout(() => {
fs.writeFileSync(getFixturePath('subdir/add.txt'), dateNow());
fs.unlinkSync(linkPath);
fs.symlinkSync(getFixturePath('subdir/add.txt'), linkPath);
}, options.usePolling ? 1200 : 300);

await delay(300);
await waitFor([spy.withArgs(EV_CHANGE, linkPath)]);
spy.should.not.have.been.calledWith(EV_ADD_DIR, linkPath);
spy.should.not.have.been.calledWith(EV_ADD, getFixturePath('link/add.txt'));
Expand Down Expand Up @@ -1965,74 +1968,6 @@ const runTests = (baseopts) => {
if (!macosFswatch) spy.should.have.been.calledOnce;
});
});
describe('close', () => {
it('should ignore further events on close', async () => {
return new Promise((resolve) => {
const spy = sinon.spy();
const watcher = chokidar_watch(currentDir, options);
watcher.once(EV_ADD, () => {
watcher.once(EV_ADD, async () => {
await watcher.on(EV_ADD, spy).close();
await delay(900);
await write(getFixturePath('add.txt'), dateNow());
spy.should.not.have.been.called;
resolve();
});
});
(async () => {
await waitForWatcher(watcher);
await write(getFixturePath('add.txt'), 'hello');
await fs_unlink(getFixturePath('add.txt'));
})();
});
});
it('should not ignore further events on close with existing watchers', async () => {
return new Promise((resolve) => {
const watcher1 = chokidar_watch(currentDir);
const watcher2 = chokidar_watch(currentDir);
// The EV_ADD event should be called on the second watcher even if the first watcher is closed
watcher2.on(EV_ADD, () => {
watcher2.on(EV_ADD, (path) => {
if (path.endsWith('add.txt')) {
resolve();
}
})
});
(async () => {
await waitForWatcher(watcher1);
await waitForWatcher(watcher2);
// Watcher 1 is closed to ensure events only happen on watcher 2
await watcher1.close();
// Write a new file into the fixtures to test the EV_ADD event
await write(getFixturePath('add.txt'), 'hello');
// Ensures EV_ADD is called. Immediately removing the file causes it to be skipped
await delay(200);
await fs_unlink(getFixturePath('add.txt'));
})()
})
});
it('should not prevent the process from exiting', async () => {
const scriptFile = getFixturePath('script.js');
const scriptContent = `
const chokidar = require("${__dirname.replace(/\\/g, '\\\\')}");
const watcher = chokidar.watch("${scriptFile.replace(/\\/g, '\\\\')}");
watcher.on("ready", () => {
watcher.close();
process.stdout.write("closed");
});`;
await write(scriptFile, scriptContent);
const obj = await exec(`node ${scriptFile}`);
const {stdout} = obj;
expect(stdout.toString()).to.equal('closed');
});
it('should always return the same promise', async () => {
const watcher = chokidar_watch(currentDir, options);
const closePromise = watcher.close();
expect(closePromise).to.be.a('promise');
expect(watcher.close()).to.be.equal(closePromise);
await closePromise;
});
});
describe('env variable option override', () => {
beforeEach(() => {
// Do not spin up
Expand Down Expand Up @@ -2167,6 +2102,7 @@ const runTests = (baseopts) => {
// The following delay is essential otherwise the call of rmdir and mkdir will be equalize
await delay(300);
await fs_mkdir(testSubDir);
await delay(300);
await write(testSubDirFile, '');
await delay(300);

Expand Down Expand Up @@ -2223,6 +2159,77 @@ const runTests = (baseopts) => {
}
});
});

describe('close', () => {
it('should ignore further events on close', async () => {
return new Promise((resolve) => {
const spy = sinon.spy();
const watcher = chokidar_watch(currentDir, options);
watcher.once(EV_ADD, () => {
watcher.once(EV_ADD, async () => {
await watcher.on(EV_ADD, spy).close();
await delay(900);
await write(getFixturePath('add.txt'), dateNow());
spy.should.not.have.been.called;
resolve();
});
});
(async () => {
await waitForWatcher(watcher);
await delay(300);
await write(getFixturePath('add.txt'), 'hello');
await delay(300);
await fs_unlink(getFixturePath('add.txt'));
})();
});
});
it('should not ignore further events on close with existing watchers', async () => {
return new Promise((resolve) => {
const watcher1 = chokidar_watch(currentDir);
const watcher2 = chokidar_watch(currentDir);
// The EV_ADD event should be called on the second watcher even if the first watcher is closed
watcher2.on(EV_ADD, () => {
watcher2.on(EV_ADD, (path) => {
if (path.endsWith('add.txt')) {
resolve();
}
})
});
(async () => {
await waitForWatcher(watcher1);
await waitForWatcher(watcher2);
// Watcher 1 is closed to ensure events only happen on watcher 2
await watcher1.close();
// Write a new file into the fixtures to test the EV_ADD event
await write(getFixturePath('add.txt'), 'hello');
// Ensures EV_ADD is called. Immediately removing the file causes it to be skipped
await delay(200);
await fs_unlink(getFixturePath('add.txt'));
})()
})
});
it('should not prevent the process from exiting', async () => {
const scriptFile = getFixturePath('script.js');
const scriptContent = `
const chokidar = require("${__dirname.replace(/\\/g, '\\\\')}");
const watcher = chokidar.watch("${scriptFile.replace(/\\/g, '\\\\')}");
watcher.on("ready", () => {
watcher.close();
process.stdout.write("closed");
});`;
await write(scriptFile, scriptContent);
const obj = await exec(`node ${scriptFile}`);
const {stdout} = obj;
expect(stdout.toString()).to.equal('closed');
});
it('should always return the same promise', async () => {
const watcher = chokidar_watch(currentDir, options);
const closePromise = watcher.close();
expect(closePromise).to.be.a('promise');
expect(watcher.close()).to.be.equal(closePromise);
await closePromise;
});
});
};

describe('chokidar', () => {
Expand Down