Ensure unittest test results are only recorded once per test run.

Fixes microsoft#2143

- Unregister listeners from socket service after each test run

Author: d3r3kk

news/2 Fixes/2143.md

@@ -0,0 +1 @@
+Ensure test count value in status bar represents the correct number of tests that were actually discovered and that were run.

src/client/unittests/common/types.ts

@@ -245,6 +245,8 @@ export type ParserOptions = TestDiscoveryOptions;
 export const IUnitTestSocketServer = Symbol('IUnitTestSocketServer');
 export interface IUnitTestSocketServer extends Disposable {
     on(event: string | symbol, listener: Function): this;
+    removeListener(event: string | symbol, listener: Function): this;
+    removeAllListeners(event: string | symbol): this;
     start(options?: { port?: number; host?: string }): Promise<number>;
     stop(): void;
 }

src/client/unittests/unittest/runner.ts

@@ -1,13 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 'use strict';
+
 import { inject, injectable } from 'inversify';
+import { Socket } from 'net';
 import * as path from 'path';
 import { EXTENSION_ROOT_DIR } from '../../common/constants';
 import { noop } from '../../common/core.utils';
 import { ILogger } from '../../common/types';
 import { IServiceContainer } from '../../ioc/types';
 import { UNITTEST_PROVIDER } from '../common/constants';
 import { Options } from '../common/runner';
-import { ITestDebugLauncher, ITestManager, ITestResultsService, ITestRunner, IUnitTestSocketServer, LaunchOptions, TestRunOptions, Tests, TestStatus, TestsToRun } from '../common/types';
+import {
+    ITestDebugLauncher, ITestManager, ITestResultsService,
+    ITestRunner, IUnitTestSocketServer, LaunchOptions,
+    TestRunOptions, Tests, TestStatus
+} from '../common/types';
 import { IArgumentsHelper, ITestManagerRunner, IUnitTestHelper } from '../types';
 
 type TestStatusMap = {
@@ -42,7 +51,9 @@ export class TestManagerRunner implements ITestManagerRunner {
         this.logger = this.serviceContainer.get<ILogger>(ILogger);
         this.helper = this.serviceContainer.get<IUnitTestHelper>(IUnitTestHelper);
     }
-    public async  runTest(testResultsService: ITestResultsService, options: TestRunOptions, testManager: ITestManager): Promise<Tests> {
+
+    // tslint:disable-next-line:max-func-body-length
+    public async runTest(testResultsService: ITestResultsService, options: TestRunOptions, testManager: ITestManager): Promise<Tests> {
         options.tests.summary.errors = 0;
         options.tests.summary.failures = 0;
         options.tests.summary.passed = 0;
@@ -53,7 +64,6 @@ export class TestManagerRunner implements ITestManagerRunner {
         this.server.on('log', noop);
         this.server.on('connect', noop);
         this.server.on('start', noop);
-        this.server.on('socket.disconnected', noop);
         this.server.on('result', (data: ITestData) => {
             const test = options.tests.testFunctions.find(t => t.testFunction.nameToRun === data.test);
             const statusDetails = outcomeMapping.get(data.outcome)!;
@@ -73,6 +83,15 @@ export class TestManagerRunner implements ITestManagerRunner {
             }
         });
 
+        this.server.on('socket.disconnected', (socket: Socket, isSocketDestroyed: boolean) => {
+            this.server.removeAllListeners('error');
+            this.server.removeAllListeners('log');
+            this.server.removeAllListeners('connect');
+            this.server.removeAllListeners('start');
+            this.server.removeAllListeners('result');
+            this.server.removeAllListeners('socket.disconnected');
+        });
+
         const port = await this.server.start();
         const testPaths: string[] = this.helper.getIdsOfTestsToRun(options.tests, options.testsToRun!);
         for (let counter = 0; counter < testPaths.length; counter += 1) {
@@ -139,6 +158,7 @@ export class TestManagerRunner implements ITestManagerRunner {
         testResultsService.updateResults(options.tests);
         return options.tests;
     }
+
     private buildTestArgs(args: string[]): string[] {
         const startTestDiscoveryDirectory = this.helper.getStartDirectory(args);
         let pattern = 'test*.py';