fix server cancelation in tests

Author: eleanorjboyd

src/test/testing/testController/testCancellationRunAdapters.unit.test.ts

@@ -66,11 +66,15 @@ suite('Execution Flow Run Adapters', () => {
             const { token } = cancellationToken;
             testRunMock.setup((t) => t.token).returns(() => token);
 
+            // run result pipe mocking and the related server close dispose
+            let deferredTillServerCloseTester: Deferred<void> | undefined;
+
             // // mock exec service and exec factory
             execServiceStub
                 .setup((x) => x.execObservable(typeMoq.It.isAny(), typeMoq.It.isAny()))
                 .returns(() => {
                     cancellationToken.cancel();
+                    deferredTillServerCloseTester?.resolve();
                     return {
                         proc: mockProc as any,
                         out: typeMoq.Mock.ofType<Observable<Output<string>>>().object,
@@ -92,11 +96,9 @@ suite('Execution Flow Run Adapters', () => {
                 return Promise.resolve('named-pipe');
             });
 
-            // run result pipe mocking and the related server close dispose
-            let deferredTillServerCloseTester: Deferred<void> | undefined;
             utilsStartRunResultNamedPipe.callsFake((_callback, deferredTillServerClose, _token) => {
                 deferredTillServerCloseTester = deferredTillServerClose;
-                return Promise.resolve({ name: 'named-pipes-socket-name', dispose: serverDisposeStub });
+                return Promise.resolve('named-pipes-socket-name');
             });
             serverDisposeStub.callsFake(() => {
                 console.log('server disposed');
@@ -122,9 +124,6 @@ suite('Execution Flow Run Adapters', () => {
             );
             // wait for server to start to keep test from failing
             await deferredStartTestIdsNamedPipe.promise;
-
-            // assert the server dispose function was called correctly
-            sinon.assert.calledOnce(serverDisposeStub);
         });
         test(`Adapter ${adapter}: token called mid-debug resolves correctly`, async () => {
             // mock test run and cancelation token
@@ -133,11 +132,15 @@ suite('Execution Flow Run Adapters', () => {
             const { token } = cancellationToken;
             testRunMock.setup((t) => t.token).returns(() => token);
 
+            // run result pipe mocking and the related server close dispose
+            let deferredTillServerCloseTester: Deferred<void> | undefined;
+
             // // mock exec service and exec factory
             execServiceStub
                 .setup((x) => x.execObservable(typeMoq.It.isAny(), typeMoq.It.isAny()))
                 .returns(() => {
                     cancellationToken.cancel();
+                    deferredTillServerCloseTester?.resolve();
                     return {
                         proc: mockProc as any,
                         out: typeMoq.Mock.ofType<Observable<Output<string>>>().object,
@@ -159,14 +162,9 @@ suite('Execution Flow Run Adapters', () => {
                 return Promise.resolve('named-pipe');
             });
 
-            // run result pipe mocking and the related server close dispose
-            let deferredTillServerCloseTester: Deferred<void> | undefined;
             utilsStartRunResultNamedPipe.callsFake((_callback, deferredTillServerClose, _token) => {
                 deferredTillServerCloseTester = deferredTillServerClose;
-                return Promise.resolve({
-                    name: 'named-pipes-socket-name',
-                    dispose: serverDisposeStub,
-                });
+                return Promise.resolve('named-pipes-socket-name');
             });
             serverDisposeStub.callsFake(() => {
                 console.log('server disposed');
@@ -190,6 +188,7 @@ suite('Execution Flow Run Adapters', () => {
                 })
                 .returns(async () => {
                     cancellationToken.cancel();
+                    deferredTillServerCloseTester?.resolve();
                     return Promise.resolve();
                 });
 
@@ -205,10 +204,6 @@ suite('Execution Flow Run Adapters', () => {
             );
             // wait for server to start to keep test from failing
             await deferredStartTestIdsNamedPipe.promise;
-
-            // TODO: fix the server disposal so it is called once not twice,
-            // currently not a problem but would be useful to improve clarity
-            sinon.assert.called(serverDisposeStub);
         });
     });
 });

src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts

@@ -77,14 +77,7 @@ suite('Unittest test discovery adapter', () => {
         };
 
         utilsStartDiscoveryNamedPipeStub = sinon.stub(util, 'startDiscoveryNamedPipe');
-        utilsStartDiscoveryNamedPipeStub.callsFake(() =>
-            Promise.resolve({
-                name: 'discoveryResultPipe-mockName',
-                dispose: () => {
-                    /* no-op */
-                },
-            }),
-        );
+        utilsStartDiscoveryNamedPipeStub.callsFake(() => Promise.resolve('discoveryResultPipe-mockName'));
     });
     teardown(() => {
         sinon.restore();