github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Code] fix lsp init unit test by using fake timers (#37201) (#37323)

Browse source 
* [Code] fix LSP init unit test by using fake timers
This commit is contained in:
Yulong 2019-05-29 19:23:17 +08:00 • committed by GitHub
parent b0e8e5e96b
commit ba40d3bebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
x-pack/plugins/code/server/lsp/request_expander.test.ts
View file

@ -16,7 +16,6 @@ import { InitializingError, RequestExpander } from './request_expander';
const options: ServerOptions = {
workspacePath: '/tmp/test/workspace',
};
beforeEach(async () => {
sinon.reset();
if (!fs.existsSync(options.workspacePath)) {
@ -31,6 +30,7 @@ afterEach(() => {
});
test('requests should be sequential', async () => {
const clock = sinon.useFakeTimers();
// @ts-ignore
const proxyStub = sinon.createStubInstance(LanguageServerProxy, {
handleRequest: sinon.stub().callsFake(() => {
@ -53,22 +53,28 @@ test('requests should be sequential', async () => {
};
const response1Promise = expander.handleRequest(request1);
const response2Promise = expander.handleRequest(request2);
clock.tick(100);
process.nextTick(() => clock.runAll());
const response1 = await response1Promise;
const response2 = await response2Promise;
// response2 should not be started before response1 ends.
expect(response1.result.end).toBeLessThanOrEqual(response2.result.start);
clock.restore();
});
test('requests should throw error after lsp init timeout', async () => {
const clock = sinon.useFakeTimers();
// @ts-ignore
const proxyStub = sinon.createStubInstance(LanguageServerProxy, {
handleRequest: sinon.stub().callsFake(() => Promise.resolve('ok')),
handleRequest: sinon.stub().callsFake(() => {
Promise.resolve('ok');
}),
initialize: sinon.stub().callsFake(
() =>
new Promise(resolve => {
setTimeout(() => {
resolve();
}, 200);
}, 300);
})
),
});
@ -89,8 +95,11 @@ test('requests should throw error after lsp init timeout', async () => {
mkdirp.sync(request2.workspacePath);
const response1Promise = expander.handleRequest(request1);
const response2Promise = expander.handleRequest(request2);
clock.tick(400);
process.nextTick(() => clock.runAll());
await expect(response1Promise).rejects.toEqual(InitializingError);
await expect(response2Promise).rejects.toEqual(InitializingError);
clock.restore();
});
test('be able to open multiple workspace', async () => {

4
x-pack/plugins/code/server/lsp/request_expander.ts
View file

@ -191,8 +191,8 @@ export class RequestExpander implements ILanguageServerHandler {
if (timeout > 0 && ws.initPromise) {
try {
const elasped = Date.now() - startTime;
await promiseTimeout(timeout - elasped, ws.initPromise);
const elapsed = Date.now() - startTime;
await promiseTimeout(timeout - elapsed, ws.initPromise);
} catch (e) {
if (e.isTimeout) {
throw InitializingError;