From ae8c6d07fb3f9c4cac896458655bae75dac000f1 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 8 Nov 2018 10:53:52 -0800 Subject: [PATCH] Attempt to fix flaky search tests --- .../parts/search/test/common/searchModel.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/search/test/common/searchModel.test.ts b/src/vs/workbench/parts/search/test/common/searchModel.test.ts index ff45b9468f0..43d9115a41c 100644 --- a/src/vs/workbench/parts/search/test/common/searchModel.test.ts +++ b/src/vs/workbench/parts/search/test/common/searchModel.test.ts @@ -220,8 +220,8 @@ suite('SearchModel', () => { let testObject = instantiationService.createInstance(SearchModel); let result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries }); - return timeout(1).then(() => { - return result.then(() => { }, () => { + return result.then(() => { }, () => { + return timeout(1).then(() => { assert.ok(target1.calledWith('searchResultsFirstRender')); assert.ok(target1.calledWith('searchResultsFinished')); // assert.ok(target2.calledOnce); @@ -243,8 +243,8 @@ suite('SearchModel', () => { deferredPromise.cancel(); - return timeout(1).then(() => { - return result.then(() => { }, () => { + return result.then(() => { }, () => { + return timeout(1).then(() => { assert.ok(target1.calledWith('searchResultsFirstRender')); assert.ok(target1.calledWith('searchResultsFinished')); // assert.ok(target2.calledOnce); -- GitLab