From 2ecb542cdeb6d5e18c20453115d15d0e7c4c85e4 Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 08:39:04 +0100 Subject: [PATCH 01/11] add logs --- test/teletype-package.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/teletype-package.test.js b/test/teletype-package.test.js index 66449705..46e43f3f 100644 --- a/test/teletype-package.test.js +++ b/test/teletype-package.test.js @@ -1376,6 +1376,7 @@ suite('TeletypePackage', function () { const getTitles = (paneItems) => paneItems.map((item) => item.getTitle()) const originalRemotePaneItems = getRemotePaneItems(environment) + console.log('LOGS', originalRemotePaneItems, getTitles(originalRemotePaneItems), getTitles(getRemotePaneItems(environment)); await condition(() => { return !deepEqual( getTitles(originalRemotePaneItems), From 45c099db4e04825cec71baa6f1ef13c182635535 Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 08:44:52 +0100 Subject: [PATCH 02/11] rm ; + ) --- test/teletype-package.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/teletype-package.test.js b/test/teletype-package.test.js index 46e43f3f..24b1bc31 100644 --- a/test/teletype-package.test.js +++ b/test/teletype-package.test.js @@ -1376,7 +1376,7 @@ suite('TeletypePackage', function () { const getTitles = (paneItems) => paneItems.map((item) => item.getTitle()) const originalRemotePaneItems = getRemotePaneItems(environment) - console.log('LOGS', originalRemotePaneItems, getTitles(originalRemotePaneItems), getTitles(getRemotePaneItems(environment)); + console.log('LOGS', originalRemotePaneItems, getTitles(originalRemotePaneItems), getTitles(getRemotePaneItems(environment))) await condition(() => { return !deepEqual( getTitles(originalRemotePaneItems), From 786db6e951172775f30aa7248a238b22f4f4f35c Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 08:55:13 +0100 Subject: [PATCH 03/11] log --- test/teletype-package.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/teletype-package.test.js b/test/teletype-package.test.js index 24b1bc31..999243e7 100644 --- a/test/teletype-package.test.js +++ b/test/teletype-package.test.js @@ -1006,6 +1006,7 @@ suite('TeletypePackage', function () { const hostEditor2 = await hostEnv.workspace.open() hostEditor2.setText(('y'.repeat(30) + '\n').repeat(30)) hostEditor2.setCursorBufferPosition([2, 2]) + console.log('LOGS', guestEnv.workspace.getTextEditors()) await condition(() => guestEnv.workspace.getTextEditors().length === 2) @@ -1376,7 +1377,6 @@ suite('TeletypePackage', function () { const getTitles = (paneItems) => paneItems.map((item) => item.getTitle()) const originalRemotePaneItems = getRemotePaneItems(environment) - console.log('LOGS', originalRemotePaneItems, getTitles(originalRemotePaneItems), getTitles(getRemotePaneItems(environment))) await condition(() => { return !deepEqual( getTitles(originalRemotePaneItems), From 9a59c3754bb7aa0549756f440eaae96121d5bd7b Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:10:59 +0100 Subject: [PATCH 04/11] added log to helper --- test/helpers/condition.js | 6 +++++- test/teletype-package.test.js | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 131dbf2e..02d1c5dd 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -1,12 +1,16 @@ -module.exports = function condition (fn) { +module.exports = function condition (fn, shouldLog = false) { const timeoutError = new Error('Condition timed out: ' + fn.toString()) Error.captureStackTrace(timeoutError, condition) return new Promise((resolve, reject) => { const intervalId = global.setInterval(async () => { let result = fn() + if(shouldLog) { + console.log({result}, fn.toString()); + } if (result instanceof Promise) { result = await result + console.log({result}, fn.toString()); } if (result) { diff --git a/test/teletype-package.test.js b/test/teletype-package.test.js index 999243e7..5489c5f9 100644 --- a/test/teletype-package.test.js +++ b/test/teletype-package.test.js @@ -1006,9 +1006,8 @@ suite('TeletypePackage', function () { const hostEditor2 = await hostEnv.workspace.open() hostEditor2.setText(('y'.repeat(30) + '\n').repeat(30)) hostEditor2.setCursorBufferPosition([2, 2]) - console.log('LOGS', guestEnv.workspace.getTextEditors()) - await condition(() => guestEnv.workspace.getTextEditors().length === 2) + await condition(() => guestEnv.workspace.getTextEditors().length === 2, true) await verifyTetheringRules({ leaderEnv: hostEnv, From aa4e09e43687a625ec46fb456dd3e749b89c91d9 Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:14:17 +0100 Subject: [PATCH 05/11] fixed linting --- test/helpers/condition.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 02d1c5dd..294aa260 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -5,12 +5,12 @@ module.exports = function condition (fn, shouldLog = false) { return new Promise((resolve, reject) => { const intervalId = global.setInterval(async () => { let result = fn() - if(shouldLog) { - console.log({result}, fn.toString()); + if (shouldLog) { + console.log({result}, fn.toString()) } if (result instanceof Promise) { result = await result - console.log({result}, fn.toString()); + console.log({result}, fn.toString()) } if (result) { From 9be84927c47d22b1bcc50c2a329d989f0aaff1df Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:25:10 +0100 Subject: [PATCH 06/11] verify if promises resolve --- test/helpers/condition.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 294aa260..a910a29b 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -5,17 +5,19 @@ module.exports = function condition (fn, shouldLog = false) { return new Promise((resolve, reject) => { const intervalId = global.setInterval(async () => { let result = fn() - if (shouldLog) { - console.log({result}, fn.toString()) - } if (result instanceof Promise) { result = await result - console.log({result}, fn.toString()) } if (result) { + if(shouldLog) { + console.log('I got here'); + } global.clearTimeout(timeout) global.clearInterval(intervalId) + if(shouldLog) { + console.log('I got here and resolved'); + } resolve() } }, 5) From 37cb97bae848e29224a02676ac8f79e8d21259bc Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:29:07 +0100 Subject: [PATCH 07/11] fixed lint again :( --- test/helpers/condition.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index a910a29b..43425716 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -10,12 +10,12 @@ module.exports = function condition (fn, shouldLog = false) { } if (result) { - if(shouldLog) { + if (shouldLog) { console.log('I got here'); } global.clearTimeout(timeout) global.clearInterval(intervalId) - if(shouldLog) { + if (shouldLog) { console.log('I got here and resolved'); } resolve() From bb9f5d54ef6308579c602ccea0249d4dd7f53d32 Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:32:13 +0100 Subject: [PATCH 08/11] rm ; --- test/helpers/condition.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 43425716..1da8c93c 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -11,12 +11,12 @@ module.exports = function condition (fn, shouldLog = false) { if (result) { if (shouldLog) { - console.log('I got here'); + console.log('I got here') } global.clearTimeout(timeout) global.clearInterval(intervalId) if (shouldLog) { - console.log('I got here and resolved'); + console.log('I got here and resolved') } resolve() } From 608de6448374ccf58e3989e3dced812ebda96c7e Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Thu, 3 Sep 2020 09:45:59 +0100 Subject: [PATCH 09/11] increased timeout --- test/helpers/condition.js | 10 ++-------- test/teletype-package.test.js | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 1da8c93c..86b8336d 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -1,4 +1,4 @@ -module.exports = function condition (fn, shouldLog = false) { +module.exports = function condition (fn) { const timeoutError = new Error('Condition timed out: ' + fn.toString()) Error.captureStackTrace(timeoutError, condition) @@ -10,14 +10,8 @@ module.exports = function condition (fn, shouldLog = false) { } if (result) { - if (shouldLog) { - console.log('I got here') - } global.clearTimeout(timeout) global.clearInterval(intervalId) - if (shouldLog) { - console.log('I got here and resolved') - } resolve() } }, 5) @@ -25,6 +19,6 @@ module.exports = function condition (fn, shouldLog = false) { const timeout = global.setTimeout(() => { global.clearInterval(intervalId) reject(timeoutError) - }, 500) + }, 1000) }) } diff --git a/test/teletype-package.test.js b/test/teletype-package.test.js index 5489c5f9..66449705 100644 --- a/test/teletype-package.test.js +++ b/test/teletype-package.test.js @@ -1007,7 +1007,7 @@ suite('TeletypePackage', function () { hostEditor2.setText(('y'.repeat(30) + '\n').repeat(30)) hostEditor2.setCursorBufferPosition([2, 2]) - await condition(() => guestEnv.workspace.getTextEditors().length === 2, true) + await condition(() => guestEnv.workspace.getTextEditors().length === 2) await verifyTetheringRules({ leaderEnv: hostEnv, From a5b8e4c26325e4f9d05f29bfe9072f1a8e61d9c5 Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Mon, 7 Sep 2020 20:20:57 +0100 Subject: [PATCH 10/11] increased interval --- test/helpers/condition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index 86b8336d..eb3078b3 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -14,7 +14,7 @@ module.exports = function condition (fn) { global.clearInterval(intervalId) resolve() } - }, 5) + }, 10) const timeout = global.setTimeout(() => { global.clearInterval(intervalId) From 1a74a8ab9663c9688ab0cca4ee6e196ab4c34caa Mon Sep 17 00:00:00 2001 From: Musa Ibrahim Date: Tue, 8 Sep 2020 08:09:38 +0100 Subject: [PATCH 11/11] reset interval and timeout --- test/helpers/condition.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/condition.js b/test/helpers/condition.js index eb3078b3..131dbf2e 100644 --- a/test/helpers/condition.js +++ b/test/helpers/condition.js @@ -14,11 +14,11 @@ module.exports = function condition (fn) { global.clearInterval(intervalId) resolve() } - }, 10) + }, 5) const timeout = global.setTimeout(() => { global.clearInterval(intervalId) reject(timeoutError) - }, 1000) + }, 500) }) }