Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)

src/vs/base/test/common/uri.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { isWindows } from 'vs/base/common/platform';
 
 
@@ -441,7 +441,7 @@ suite('URI', () => {
 		// let c = 100000;
 		// while (c-- > 0) {
 		for (let value of values) {
-			let data = value.toJSON();
+			let data = value.toJSON() as UriComponents;
 			let clone = URI.revive(data);
 
 			assert.equal(clone.scheme, value.scheme);

src/vs/base/test/node/encoding/encoding.test.ts

@@ -11,6 +11,14 @@ import { Readable } from 'stream';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('Encoding', () => {
+
+	test('detectBOM does not return error for non existing file', async () => {
+		const file = getPathFromAmdModule(require, './fixtures/not-exist.css');
+
+		const detectedEncoding = await encoding.detectEncodingByBOM(file);
+		assert.equal(detectedEncoding, null);
+	});
+
 	test('detectBOM UTF-8', async () => {
 		const file = getPathFromAmdModule(require, './fixtures/some_utf8.css');
 

src/vs/base/test/node/id.test.ts

@@ -8,7 +8,8 @@ import { getMachineId } from 'vs/base/node/id';
 
 suite('ID', () => {
 
-	test('getMachineId', () => {
+	test('getMachineId', function () {
+		this.timeout(20000);
 		return getMachineId().then(id => {
 			assert.ok(id);
 		});