From 5cb226b680788fc9ac17516ec82d7c0ec6c8c854 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Fri, 26 Jan 2018 11:34:28 +0100
Subject: [PATCH] smoketests: always enable debug tests

---
 test/smoke/src/areas/debug/debug.test.ts | 74 +-----------------------
 1 file changed, 2 insertions(+), 72 deletions(-)

diff --git a/test/smoke/src/areas/debug/debug.test.ts b/test/smoke/src/areas/debug/debug.test.ts
index 3218911858d..7e924b95b62 100644
--- a/test/smoke/src/areas/debug/debug.test.ts
+++ b/test/smoke/src/areas/debug/debug.test.ts
@@ -5,54 +5,19 @@
 
 import * as assert from 'assert';
 import * as http from 'http';
-import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as stripJsonComments from 'strip-json-comments';
-import { SpectronApplication, Quality } from '../../spectron/application';
+import { SpectronApplication } from '../../spectron/application';
 
 export function setup() {
 	describe('Debug', () => {
-		let skip = false;
-
 		before(async function () {
 			const app = this.app as SpectronApplication;
-
-			if (app.quality === Quality.Dev) {
-				const extensionsPath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions');
-
-				const debugPath = path.join(extensionsPath, 'vscode-node-debug');
-				const debugExists = fs.existsSync(debugPath);
-
-				const debug2Path = path.join(extensionsPath, 'vscode-node-debug2');
-				const debug2Exists = fs.existsSync(debug2Path);
-
-				if (!debugExists) {
-					console.warn(`Skipping debug tests because vscode-node-debug extension was not found in ${extensionsPath}`);
-					skip = true;
-					return;
-				}
-
-				if (!debug2Exists) {
-					console.warn(`Skipping debug tests because vscode-node-debug2 extension was not found in ${extensionsPath}`);
-					skip = true;
-					return;
-				}
-
-				await new Promise((c, e) => fs.symlink(debugPath, path.join(app.extensionsPath, 'vscode-node-debug'), err => err ? e(err) : c()));
-				await new Promise((c, e) => fs.symlink(debug2Path, path.join(app.extensionsPath, 'vscode-node-debug2'), err => err ? e(err) : c()));
-				await app.reload();
-			}
-
-			this.app.suiteName = 'Debug';
+			app.suiteName = 'Debug';
 		});
 
 		it('configure launch json', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.debug.openDebugViewlet();
@@ -78,11 +43,6 @@ export function setup() {
 		});
 
 		it('breakpoints', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.quickopen.openFile('index.js');
@@ -92,11 +52,6 @@ export function setup() {
 
 		let port: number;
 		it('start debugging', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			port = await app.workbench.debug.startDebugging();
@@ -112,11 +67,6 @@ export function setup() {
 		});
 
 		it('focus stack frames and variables', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.client.waitFor(() => app.workbench.debug.getLocalVariableCount(), c => c === 4, 'there should be 4 local variables');
@@ -132,11 +82,6 @@ export function setup() {
 		});
 
 		it('stepOver, stepIn, stepOut', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.debug.stepIn();
@@ -154,11 +99,6 @@ export function setup() {
 		});
 
 		it('continue', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.debug.continue();
@@ -174,22 +114,12 @@ export function setup() {
 		});
 
 		it('debug console', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.debug.waitForReplCommand('2 + 2', r => r === '4');
 		});
 
 		it('stop debugging', async function () {
-			if (skip) {
-				this.skip();
-				return;
-			}
-
 			const app = this.app as SpectronApplication;
 
 			await app.workbench.debug.stopDebugging();