From a51683b40a57d1b4ac678a9459e30e9dde53ad8a Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 27 Nov 2019 12:21:28 -0700
Subject: [PATCH 1/2] Skip more tests.

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

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index 0274c064f8a6..356e99639b72 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -375,6 +375,12 @@ suite('Raw FileSystem', () => {
     });
 
     suite('createWriteStream', () => {
+        setup(function() {
+            // Tests disabled due to CI failures: https://github.com/microsoft/vscode-python/issues/8804
+            // tslint:disable-next-line:no-invalid-this
+            return this.skip();
+        });
+
         test('returns the correct WriteStream', async () => {
             const filename = await fix.resolve('x/y/z/spam.py');
             const expected = fsextra.createWriteStream(filename);
@@ -538,6 +544,12 @@ suite('FileSystem Utils', () => {
     });
 
     suite('search', () => {
+        setup(function() {
+            // Tests disabled due to CI failures: https://github.com/microsoft/vscode-python/issues/8804
+            // tslint:disable-next-line:no-invalid-this
+            return this.skip();
+        });
+
         test('found matches', async () => {
             const pattern = await fix.resolve(`x/y/z/spam.*`);
             const expected: string[] = [

From 7d0d1fa7b1182fd7c172a6c62e5db7cdce6b48ef Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 27 Nov 2019 12:22:29 -0700
Subject: [PATCH 2/2] Fall back to fsextra.remove() when
 tempDir.removeCallback() fails.

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

diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index 356e99639b72..0834c7f4a4f3 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -51,7 +51,14 @@ export class FSFixture {
         if (this.tempDir) {
             const tempDir = this.tempDir;
             this.tempDir = undefined;
-            tempDir.removeCallback();
+            try {
+                tempDir.removeCallback();
+            } catch {
+                // The "unsafeCleanup: true" option is supposed
+                // to support a non-empty directory, but apparently
+                // that isn't always the case.  (see #8804)
+                await fsextra.remove(tempDir.name);
+            }
         }
         if (this.sockServer) {
             const srv = this.sockServer;