From e00884c2af8f302297d44c61d697caa2bf7a7567 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 11:27:36 -0700
Subject: [PATCH 1/6] Disable problematic tests on OSX.

---
 .../common/platform/filesystem.functional.test.ts    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index d3759d69c301..f454c2de6c3c 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -10,6 +10,7 @@ import { convertStat, FileSystem } from '../../../client/common/platform/fileSys
 import { PlatformService } from '../../../client/common/platform/platformService';
 import { FileType, TemporaryFile } from '../../../client/common/platform/types';
 import { sleep } from '../../../client/common/utils/async';
+import { getOSType, OSType } from '../../../client/common/utils/platform';
 import {
     assertDoesNotExist, assertExists, DOES_NOT_EXIST, fixPath, FSFixture,
     SUPPORTS_SYMLINKS, WINDOWS
@@ -20,6 +21,8 @@ const assertArrays = require('chai-arrays');
 use(require('chai-as-promised'));
 use(assertArrays);
 
+const platform = getOSType();
+
 suite('FileSystem', () => {
     let fileSystem: FileSystem;
     let fix: FSFixture;
@@ -87,7 +90,14 @@ suite('FileSystem', () => {
         suite('getRealPath', () => {
             const prevCwd = process.cwd();
             let cwd: string;
-            setup(async () => {
+            setup(async function() {
+                if (platform === OSType.OSX) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) This test is failing on Mac, so we are
+                    // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
                 cwd = await fix.createDirectory('x/y/z');
                 process.chdir(cwd);
             });

From d2a17122a242b01049c0f89ff21d9018d730ec73 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 11:31:13 -0700
Subject: [PATCH 2/6] Disable problematic tests on Windows.

---
 .../common/platform/filesystem.functional.test.ts   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index f454c2de6c3c..ce098040d273 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -93,8 +93,8 @@ suite('FileSystem', () => {
             setup(async function() {
                 if (platform === OSType.OSX) {
                     // tslint:disable-next-line:no-suspicious-comment
-                    // TODO(GH-8995) This test is failing on Mac, so we are
-                    // temporarily disabling it.
+                    // TODO(GH-8995) These tests are failing on Mac, so
+                    // we are temporarily disabling it.
                     // tslint:disable-next-line:no-invalid-this
                     return this.skip();
                 }
@@ -312,6 +312,15 @@ suite('FileSystem', () => {
         });
 
         suite('listdir', () => {
+            setup(function() {
+                if (WINDOWS) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) These tests are failing on Windows,
+                    // so we are // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
+            });
             if (SUPPORTS_SYMLINKS) {
                 test('mixed', async () => {
                     // Create the target directory and its contents.

From b873ff9cff945a0a1dbfea104bd022e34720fd88 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 12:07:23 -0700
Subject: [PATCH 3/6] Address a couple other failures on OSX and Windows.

---
 .../platform/filesystem.functional.test.ts    | 78 ++++++++++++++-----
 src/test/common/platform/utils.ts             |  6 ++
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index ce098040d273..691ba84a5558 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -10,10 +10,9 @@ import { convertStat, FileSystem } from '../../../client/common/platform/fileSys
 import { PlatformService } from '../../../client/common/platform/platformService';
 import { FileType, TemporaryFile } from '../../../client/common/platform/types';
 import { sleep } from '../../../client/common/utils/async';
-import { getOSType, OSType } from '../../../client/common/utils/platform';
 import {
     assertDoesNotExist, assertExists, DOES_NOT_EXIST, fixPath, FSFixture,
-    SUPPORTS_SYMLINKS, WINDOWS
+    OSX, SUPPORTS_SOCKETS, SUPPORTS_SYMLINKS, WINDOWS
 } from './utils';
 
 // tslint:disable:no-require-imports no-var-requires
@@ -21,8 +20,6 @@ const assertArrays = require('chai-arrays');
 use(require('chai-as-promised'));
 use(assertArrays);
 
-const platform = getOSType();
-
 suite('FileSystem', () => {
     let fileSystem: FileSystem;
     let fix: FSFixture;
@@ -91,7 +88,7 @@ suite('FileSystem', () => {
             const prevCwd = process.cwd();
             let cwd: string;
             setup(async function() {
-                if (platform === OSType.OSX) {
+                if (OSX) {
                     // tslint:disable-next-line:no-suspicious-comment
                     // TODO(GH-8995) These tests are failing on Mac, so
                     // we are temporarily disabling it.
@@ -312,15 +309,6 @@ suite('FileSystem', () => {
         });
 
         suite('listdir', () => {
-            setup(function() {
-                if (WINDOWS) {
-                    // tslint:disable-next-line:no-suspicious-comment
-                    // TODO(GH-8995) These tests are failing on Windows,
-                    // so we are // temporarily disabling it.
-                    // tslint:disable-next-line:no-invalid-this
-                    return this.skip();
-                }
-            });
             if (SUPPORTS_SYMLINKS) {
                 test('mixed', async () => {
                     // Create the target directory and its contents.
@@ -378,7 +366,7 @@ suite('FileSystem', () => {
                         [subdir, FileType.Directory]
                     ]);
                 });
-            } else {
+            } else if (SUPPORTS_SOCKETS) {
                 test('mixed', async () => {
                     // Create the target directory and its contents.
                     const dirname = await fix.createDirectory('x/y/z');
@@ -405,6 +393,31 @@ suite('FileSystem', () => {
                         [subdir, FileType.Directory]
                     ]);
                 });
+            } else {
+                test('mixed', async () => {
+                    // Create the target directory and its contents.
+                    const dirname = await fix.createDirectory('x/y/z');
+                    const file1 = await fix.createFile('x/y/z/__init__.py', '');
+                    const script = await fix.createFile('x/y/z/__main__.py', '<script here>');
+                    const file2 = await fix.createFile('x/y/z/spam.py', '...');
+                    const file3 = await fix.createFile('x/y/z/eggs.py', '"""..."""');
+                    const subdir = await fix.createDirectory('x/y/z/w');
+                    // Create other files and directories (should be ignored).
+                    await fix.createFile('x/__init__.py', '');
+                    await fix.createFile('x/y/__init__.py', '');
+                    await fix.createDirectory('x/y/z/w/data');
+                    await fix.createFile('x/y/z/w/data/v1.json');
+
+                    const entries = await fileSystem.listdir(dirname);
+
+                    expect(entries.sort()).to.deep.equal([
+                        [file1, FileType.File],
+                        [script, FileType.File],
+                        [file3, FileType.File],
+                        [file2, FileType.File],
+                        [subdir, FileType.Directory]
+                    ]);
+                });
             }
 
             test('empty', async () => {
@@ -900,7 +913,14 @@ suite('FileSystem', () => {
                 expect(actual).to.equal(data);
             });
 
-            test('overwrites existing file', async () => {
+            test('overwrites existing file', async function() {
+                if (OSX) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) This test is failing on Mac, so
+                    // we are temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
                 const filename = await fix.createFile('x/y/z/spam.py', '...');
                 const data = 'line1\nline2\n';
 
@@ -947,7 +967,11 @@ suite('FileSystem', () => {
                 expect(exists).to.equal(true);
             });
 
-            test('unknown', async () => {
+            test('unknown', async function() {
+                if (!SUPPORTS_SOCKETS) {
+                    // tslint:disable-next-line:no-invalid-this
+                    this.skip();
+                }
                 const sockFile = await fix.createSocket('x/y/z/ipc.sock');
 
                 const exists = await fileSystem.fileExists(sockFile);
@@ -983,7 +1007,11 @@ suite('FileSystem', () => {
                 expect(exists).to.equal(true);
             });
 
-            test('unknown', async () => {
+            test('unknown', async function() {
+                if (!SUPPORTS_SOCKETS) {
+                    // tslint:disable-next-line:no-invalid-this
+                    this.skip();
+                }
                 const sockFile = await fix.createSocket('x/y/z/ipc.sock');
 
                 const exists = await fileSystem.directoryExists(sockFile);
@@ -1022,7 +1050,9 @@ suite('FileSystem', () => {
                     await fix.createFile('x/y/z/scripts/spam.py');
                     const subdir2 = await fix.createDirectory('x/y/z/scripts/v');
                     await fix.createFile('x/y/z/scripts/eggs.py');
-                    await fix.createSocket('x/y/z/scripts/spam.sock');
+                    if (SUPPORTS_SOCKETS) {
+                        await fix.createSocket('x/y/z/scripts/spam.sock');
+                    }
                     await fix.createFile('x/y/z/scripts/data.json');
 
                     const results = await fileSystem.getSubDirectories(dirname);
@@ -1072,7 +1102,9 @@ suite('FileSystem', () => {
                     const file1 = await fix.createFile('x/y/z/scripts/spam.py');
                     await fix.createDirectory('x/y/z/scripts/v');
                     const file2 = await fix.createFile('x/y/z/scripts/eggs.py');
-                    await fix.createSocket('x/y/z/scripts/spam.sock');
+                    if (SUPPORTS_SOCKETS) {
+                        await fix.createSocket('x/y/z/scripts/spam.sock');
+                    }
                     const file3 = await fix.createFile('x/y/z/scripts/data.json');
 
                     const results = await fileSystem.getFiles(dirname);
@@ -1317,7 +1349,11 @@ suite('FileSystem', () => {
                 expect(exists).to.equal(true);
             });
 
-            test('unknown', async () => {
+            test('unknown', async function() {
+                if (!SUPPORTS_SOCKETS) {
+                    // tslint:disable-next-line:no-invalid-this
+                    this.skip();
+                }
                 const sockFile = await fix.createSocket('x/y/z/ipc.sock');
 
                 const exists = fileSystem.fileExistsSync(sockFile);
diff --git a/src/test/common/platform/utils.ts b/src/test/common/platform/utils.ts
index 4764277795e9..79588c045c55 100644
--- a/src/test/common/platform/utils.ts
+++ b/src/test/common/platform/utils.ts
@@ -13,6 +13,7 @@ import * as tmpMod from 'tmp';
 // found in filesystem.test.ts.
 
 export const WINDOWS = /^win/.test(process.platform);
+export const OSX = /^darwin/.test(process.platform);
 
 export const SUPPORTS_SYMLINKS = (() => {
     const source = fsextra.readdirSync('.')[0];
@@ -26,6 +27,11 @@ export const SUPPORTS_SYMLINKS = (() => {
     return true;
 })();
 
+// tslint:disable-next-line:no-suspicious-comment
+// TODO(GH-8995) For the moment we simply say we cannot test with
+// sockets on Windows.
+export const SUPPORTS_SOCKETS = !WINDOWS;
+
 export const DOES_NOT_EXIST = 'this file does not exist';
 
 export async function assertDoesNotExist(filename: string) {

From 3e8e599db7b31febe931d5a5ce57c9a8465d9af2 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 12:21:34 -0700
Subject: [PATCH 4/6] Skip the "mixed" listdir test on Windows.

---
 src/test/common/platform/filesystem.functional.test.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index 691ba84a5558..3738387f3061 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -309,6 +309,15 @@ suite('FileSystem', () => {
         });
 
         suite('listdir', () => {
+            setup(function() {
+                if (WINDOWS) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) These tests are failing on Windows,
+                    // so we are // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
+            });
             if (SUPPORTS_SYMLINKS) {
                 test('mixed', async () => {
                     // Create the target directory and its contents.

From da207a45e0516d56200b0310673d0e0e5534149d Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 12:42:16 -0700
Subject: [PATCH 5/6] Skip a few more tests on Windows.

---
 .../platform/filesystem.functional.test.ts    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index 3738387f3061..57dc0c9aa5eb 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -1030,6 +1030,15 @@ suite('FileSystem', () => {
         });
 
         suite('getSubDirectories', () => {
+            setup(function() {
+                if (WINDOWS) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) These tests are failing on Windows,
+                    // so we are // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
+            });
             if (SUPPORTS_SYMLINKS) {
                 test('mixed types', async () => {
                     const symlinkFileSource = await fix.createFile('x/info.py');
@@ -1081,6 +1090,15 @@ suite('FileSystem', () => {
         });
 
         suite('getFiles', () => {
+            setup(function() {
+                if (WINDOWS) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) These tests are failing on Windows,
+                    // so we are // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
+            });
             if (SUPPORTS_SYMLINKS) {
                 test('mixed types', async () => {
                     const symlinkFileSource = await fix.createFile('x/info.py');
@@ -1359,6 +1377,13 @@ suite('FileSystem', () => {
             });
 
             test('unknown', async function() {
+                if (WINDOWS) {
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO(GH-8995) These tests are failing on Windows,
+                    // so we are // temporarily disabling it.
+                    // tslint:disable-next-line:no-invalid-this
+                    return this.skip();
+                }
                 if (!SUPPORTS_SOCKETS) {
                     // tslint:disable-next-line:no-invalid-this
                     this.skip();

From cc5006f4f10085108aab96d972a074ea146ac9f4 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 1 Jan 2020 13:19:15 -0700
Subject: [PATCH 6/6] Deal with path normalization on Windows.

---
 src/test/common/platform/filesystem.functional.test.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index 57dc0c9aa5eb..0bf6b1709734 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -1228,8 +1228,11 @@ suite('FileSystem', () => {
                 await fix.createFile('x/y/z/spam');
                 await fix.createFile('x/spam.py');
 
-                const files = await fileSystem.search(pattern);
+                let files = await fileSystem.search(pattern);
 
+                // For whatever reason, on Windows "search()" is
+                // returning filenames with forward slasshes...
+                files = files.map(fixPath);
                 expect(files.sort()).to.deep.equal(expected.sort());
             });