vsts: report smoketest results

joaomoreno · joaomoreno · commit 8a3ffed0abfe · 2018-06-12T17:37:53.000+02:00
diff --git a/extensions/css-language-features/server/test/index.js b/extensions/css-language-features/server/test/index.js
@@ -10,8 +10,8 @@ const glob = require('glob');
 const suite = 'Integration CSS Extension Tests';
 
 const options = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/emmet/src/test/index.ts b/extensions/emmet/src/test/index.ts
@@ -9,8 +9,8 @@ const testRunner = require('vscode/lib/testrunner');
 const suite = 'Integration Emmet Tests';
 
 const options: any = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/html-language-features/server/test/index.js b/extensions/html-language-features/server/test/index.js
@@ -10,8 +10,8 @@ const glob = require('glob');
 const suite = 'Integration HTML Extension Tests';
 
 const options = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/markdown-language-features/src/test/index.ts b/extensions/markdown-language-features/src/test/index.ts
@@ -9,8 +9,8 @@ const testRunner = require('vscode/lib/testrunner');
 const suite = 'Integration Markdown Tests';
 
 const options: any = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
@@ -9,8 +9,8 @@ const testRunner = require('vscode/lib/testrunner');
 const suite = 'Integration Single Folder Tests';
 
 const options: any = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-api-tests/src/workspace-tests/index.ts b/extensions/vscode-api-tests/src/workspace-tests/index.ts
@@ -9,8 +9,8 @@ const testRunner = require('vscode/lib/testrunner');
 const suite = 'Integration Workspace Tests';
 
 const options: any = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-colorize-tests/src/index.ts b/extensions/vscode-colorize-tests/src/index.ts
@@ -9,8 +9,8 @@ const testRunner = require('vscode/lib/testrunner');
 const suite = 'Integration Colorize Tests';
 
 const options: any = {
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: true, // colored output from test results (only windows cannot handle)
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
 };
 
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "7z": "7z",
     "update-grammars": "node build/npm/update-all-grammars.js",
     "update-localization-extension": "node build/npm/update-localization-extension.js",
-    "smoketest": "cd test/smoke && mocha",
+    "smoketest": "cd test/smoke && node test/index.js",
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
     "download-builtin-extensions": "node build/lib/builtInExtensions.js",
     "check-monaco-editor-compilation": "tsc -p src/tsconfig.monaco.json --noEmit"
@@ -137,4 +137,4 @@
     "windows-mutex": "^0.2.0",
     "windows-process-tree": "0.2.2"
   }
-}
+}
diff --git a/test/smoke/package.json b/test/smoke/package.json
@@ -25,7 +25,9 @@
     "electron": "1.7.7",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
+    "mocha": "^5.2.0",
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7",
     "ncp": "^2.0.0",
     "portastic": "^1.0.1",
     "rimraf": "^2.6.1",
diff --git a/test/smoke/test/index.js b/test/smoke/test/index.js
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const Mocha = require('mocha');
+
+const suite = 'Smoke Tests';
+
+const options = {
+	useColors: true,
+	timeout: 60000,
+	slow: 30000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+const mocha = new Mocha(options);
+mocha.addFile('out/main.js');
+mocha.run(failures => process.exit(failures ? -1 : 0));
diff --git a/test/smoke/test/mocha.opts b/test/smoke/test/mocha.opts
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
