From 3b9438932c732af8acdcac63024b9e742663a584 Mon Sep 17 00:00:00 2001
From: eleanorjboyd <eleanorboyd@microsoft.com>
Date: Mon, 14 Aug 2023 15:41:28 -0700
Subject: [PATCH 1/2] fix test to stop disposing of all services

---
 src/test/common/configuration/service.test.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/common/configuration/service.test.ts b/src/test/common/configuration/service.test.ts
index ff47500db731..7f83aad386af 100644
--- a/src/test/common/configuration/service.test.ts
+++ b/src/test/common/configuration/service.test.ts
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 import { expect } from 'chai';
 import { workspace } from 'vscode';
-import { IConfigurationService, IDisposableRegistry } from '../../../client/common/types';
-import { disposeAll } from '../../../client/common/utils/resourceLifecycle';
+import { IConfigurationService, IDisposableRegistry, IExtensionContext } from '../../../client/common/types';
 import { IServiceContainer } from '../../../client/ioc/types';
 import { getExtensionSettings } from '../../extensionSettings';
 import { initialize } from '../../initialize';
@@ -23,15 +22,16 @@ suite('Configuration Service', () => {
 
     test('Ensure async registry works', async () => {
         const asyncRegistry = serviceContainer.get<IDisposableRegistry>(IDisposableRegistry);
-        let disposed = false;
+        let subs = serviceContainer.get<IExtensionContext>(IExtensionContext).subscriptions;
+        const oldLength = subs.length;
         const disposable = {
             dispose(): Promise<void> {
-                disposed = true;
                 return Promise.resolve();
             },
         };
         asyncRegistry.push(disposable);
-        await disposeAll(asyncRegistry);
-        expect(disposed).to.be.equal(true, "Didn't dispose during async registry cleanup");
+        subs = serviceContainer.get<IExtensionContext>(IExtensionContext).subscriptions;
+        const newLength = subs.length;
+        expect(newLength).to.be.equal(oldLength + 1, 'Subscription not added');
     });
 });

From 865d36cd54bf1c70bf836caa710e5367a0e0ebad Mon Sep 17 00:00:00 2001
From: eleanorjboyd <eleanorboyd@microsoft.com>
Date: Mon, 14 Aug 2023 15:52:17 -0700
Subject: [PATCH 2/2] add msg

---
 src/test/common/configuration/service.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/common/configuration/service.test.ts b/src/test/common/configuration/service.test.ts
index 7f83aad386af..c57617b2a610 100644
--- a/src/test/common/configuration/service.test.ts
+++ b/src/test/common/configuration/service.test.ts
@@ -33,5 +33,6 @@ suite('Configuration Service', () => {
         subs = serviceContainer.get<IExtensionContext>(IExtensionContext).subscriptions;
         const newLength = subs.length;
         expect(newLength).to.be.equal(oldLength + 1, 'Subscription not added');
+        // serviceContainer subscriptions are not disposed of as this breaks other tests that use the service container.
     });
 });