From c35b6a3b799fea9621bbff17504259fa684f6c47 Mon Sep 17 00:00:00 2001
From: Eleanor Boyd <eleanorboyd@microsoft.com>
Date: Mon, 14 Aug 2023 16:24:16 -0700
Subject: [PATCH] Fix `service.test.ts` to stop disposing of all services
 (#21811)

file `service.test.ts` was calling to dispose of all items related to
the service container for clean up. This led to services in later tests
failing since they were close already. Fixes here allow for new tests in
the test adapter to be written.

fix helps https://github.com/microsoft/vscode-python/pull/21803
---
 src/test/common/configuration/service.test.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/test/common/configuration/service.test.ts b/src/test/common/configuration/service.test.ts
index ff47500db731..c57617b2a610 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,17 @@ 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');
+        // serviceContainer subscriptions are not disposed of as this breaks other tests that use the service container.
     });
 });