From 4bcac02b159616d64c80d32f3a821345dc3ed620 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 16 Jul 2021 05:16:01 -0700
Subject: [PATCH 1/4] Revert "skip failing tests - #128828"

This reverts commit 599f5d2c67571f84a045a59eb3423bc254ee87d9.
---
 .../src/singlefolder-tests/terminal.test.ts               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index 0fa53ede3dd..bc72fe0d18e 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -669,7 +669,7 @@ import { assertNoRpc } from '../utils';
 		});
 
 		suite('environmentVariableCollection', () => {
-			test.skip('should have collection variables apply to terminals immediately after setting', (done) => {
+			test('should have collection variables apply to terminals immediately after setting', (done) => {
 				// Text to match on before passing the test
 				const expectedText = [
 					'~a2~',
@@ -714,7 +714,7 @@ import { assertNoRpc } from '../utils';
 				terminal.sendText('echo $C');
 			});
 
-			test.skip('should have collection variables apply to environment variables that don\'t exist', (done) => {
+			test('should have collection variables apply to environment variables that don\'t exist', (done) => {
 				// Text to match on before passing the test
 				const expectedText = [
 					'~a2~',
@@ -759,7 +759,7 @@ import { assertNoRpc } from '../utils';
 				terminal.sendText('echo $C');
 			});
 
-			test.skip('should respect clearing entries', (done) => {
+			test('should respect clearing entries', (done) => {
 				// Text to match on before passing the test
 				const expectedText = [
 					'~a1~',
@@ -800,7 +800,7 @@ import { assertNoRpc } from '../utils';
 				terminal.sendText('echo $B');
 			});
 
-			test.skip('should respect deleting entries', (done) => {
+			test('should respect deleting entries', (done) => {
 				// Text to match on before passing the test
 				const expectedText = [
 					'~a1~',

From fcce57fc66c74845b9902265e9195fb495f26563 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 16 Jul 2021 06:05:34 -0700
Subject: [PATCH 2/4] Debug logs in test

---
 .../vscode-api-tests/src/singlefolder-tests/terminal.test.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index bc72fe0d18e..8b687e1fbff 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -682,8 +682,11 @@ import { assertNoRpc } from '../utils';
 						return;
 					}
 					data += sanitizeData(e.data);
+					console.log(`new data: "${e.data}"`);
+					console.log(`all data: "${data}"`);
 					// Multiple expected could show up in the same data event
 					while (expectedText.length > 0 && data.indexOf(expectedText[0]) >= 0) {
+						console.log(`found, shift expected: "${expectedText[0]}"`);
 						expectedText.shift();
 						// Check if all string are found, if so finish the test
 						if (expectedText.length === 0) {

From bbd67acb25172af95e8afd4a3ff726f103883d70 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 16 Jul 2021 06:52:18 -0700
Subject: [PATCH 3/4] Remove replaceAll

---
 .../vscode-api-tests/src/singlefolder-tests/terminal.test.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index 8b687e1fbff..78a39b7ad96 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -871,12 +871,12 @@ import { assertNoRpc } from '../utils';
 
 function sanitizeData(data: string): string {
 	// Strip NL/CR so terminal dimensions don't impact tests
-	data = data.replaceAll(/[\r\n]/g, '');
+	data = data.replace(/[\r\n]/g, '');
 
 	// Strip escape sequences so winpty/conpty doesn't cause flakiness, do for all platforms for
 	// consistency
 	const terminalCodesRegex = /(?:\u001B|\u009B)[\[\]()#;?]*(?:(?:(?:[a-zA-Z0-9]*(?:;[a-zA-Z0-9]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-PR-TZcf-ntqry=><~]))/g;
-	data = data.replaceAll(terminalCodesRegex, '');
+	data = data.replace(terminalCodesRegex, '');
 
 	return data;
 }

From 740774991eebd3d2a56adcd7695ff1dbaba700fe Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 16 Jul 2021 08:27:51 -0700
Subject: [PATCH 4/4] Remove debug logs

---
 .../vscode-api-tests/src/singlefolder-tests/terminal.test.ts   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index 78a39b7ad96..3b9ce8d4529 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -682,11 +682,8 @@ import { assertNoRpc } from '../utils';
 						return;
 					}
 					data += sanitizeData(e.data);
-					console.log(`new data: "${e.data}"`);
-					console.log(`all data: "${data}"`);
 					// Multiple expected could show up in the same data event
 					while (expectedText.length > 0 && data.indexOf(expectedText[0]) >= 0) {
-						console.log(`found, shift expected: "${expectedText[0]}"`);
 						expectedText.shift();
 						// Check if all string are found, if so finish the test
 						if (expectedText.length === 0) {