Merge branch 'daemonPool' of github.com:DonJayamanne/pythonVSCode into daemonPool

* 'daemonPool' of github.com:DonJayamanne/pythonVSCode:
  Changes to how we use rewiremock

Author: DonJayamanne

package-lock.json

@@ -2882,7 +2882,7 @@
         "react-json-tree": "^0.11.0",
         "relative": "^3.0.2",
         "retyped-diff-match-patch-tsd-ambient": "^1.0.0-0",
-        "rewiremock": "^3.13.0",
+        "rewiremock": "^3.13.9",
         "sass-loader": "^7.1.0",
         "shortid": "^2.2.8",
         "sinon": "^7.3.2",

package.json

@@ -7,7 +7,6 @@
 
 import { expect } from 'chai';
 import * as path from 'path';
-import rewiremock from 'rewiremock';
 import { anything, instance, mock, verify, when } from 'ts-mockito';
 import * as typemoq from 'typemoq';
 import { Uri } from 'vscode';
@@ -21,6 +20,7 @@ import { EXTENSION_ROOT_DIR } from '../../../client/common/constants';
 import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
 import { EnvironmentVariablesProvider } from '../../../client/common/variables/environmentVariablesProvider';
 import { EnvironmentActivationService } from '../../../client/interpreter/activation/service';
+import { rewiremock } from '../../common';
 
 const dotNetCommand = 'dotnet';
 const languageClientName = 'Python Tools';

src/test/activation/languageServer/languageClientFactory.unit.test.ts

@@ -5,9 +5,12 @@
 // tslint:disable:no-console no-require-imports no-var-requires
 
 import * as assert from 'assert';
+import { execFileSync } from 'child_process';
 import * as fs from 'fs-extra';
 import * as glob from 'glob';
 import * as path from 'path';
+// tslint:disable-next-line: match-default-export-name
+import rewiremock from 'rewiremock';
 import { coerce, SemVer } from 'semver';
 import { ConfigurationTarget, Event, TextDocument, Uri } from 'vscode';
 import { IExtensionApi } from '../client/api';
@@ -19,6 +22,9 @@ import {
     EXTENSION_ROOT_DIR_FOR_TESTS, IS_MULTI_ROOT_TEST, IS_PERF_TEST, IS_SMOKE_TEST
 } from './constants';
 import { noop } from './core';
+// Based on guidelines from https://www.npmjs.com/package/rewiremock
+rewiremock.overrideEntryPoint(module);
+export { rewiremock };
 
 const StreamZip = require('node-stream-zip');
 
@@ -231,6 +237,14 @@ export function getOSType(platform: string = process.platform): OSType {
     }
 }
 
+let pythonVersion: SemVer | undefined;
+export function getPythonVersion(): SemVer {
+    if (!pythonVersion) {
+        const output = execFileSync(PYTHON_PATH, ['--version'], {encoding: 'utf8'});
+        pythonVersion = new SemVer(output.toString().trim());
+    }
+    return pythonVersion;
+}
 /**
  * Update a string that represents a path in any OS to the string representation of
  * that same path in a different OS. Note: Does not handle drive letter if the path

src/test/common.ts

@@ -9,7 +9,6 @@ import { expect } from 'chai';
 import * as fsExtra from 'fs-extra';
 import * as nock from 'nock';
 import * as path from 'path';
-import rewiremock from 'rewiremock';
 import * as sinon from 'sinon';
 import { Readable, Writable } from 'stream';
 import { anything, instance, mock, verify, when } from 'ts-mockito';
@@ -24,6 +23,7 @@ import { IFileSystem } from '../../../client/common/platform/types';
 import { IHttpClient } from '../../../client/common/types';
 import { Http } from '../../../client/common/utils/localize';
 import { EXTENSION_ROOT_DIR } from '../../../client/constants';
+import { rewiremock } from '../../common';
 import { noop } from '../../core';
 import { MockOutputChannel } from '../../mockClasses';
 const requestProgress = require('request-progress');

src/test/common/net/fileDownloader.unit.test.ts

@@ -7,13 +7,12 @@
 
 import * as assert from 'assert';
 import { expect } from 'chai';
-// tslint:disable-next-line: match-default-export-name
-import rewiremock from 'rewiremock';
 import * as TypeMoq from 'typemoq';
 import { WorkspaceConfiguration } from 'vscode';
 import { IWorkspaceService } from '../../../client/common/application/types';
 import { HttpClient } from '../../../client/common/net/httpClient';
 import { IServiceContainer } from '../../../client/ioc/types';
+import { rewiremock } from '../../common';
 
 // tslint:disable-next-line: max-func-body-length
 suite('Http Client', () => {

src/test/common/net/httpClient.unit.test.ts

@@ -20,7 +20,7 @@ import { createTemporaryFile } from '../../../client/common/utils/fs';
 import { Architecture } from '../../../client/common/utils/platform';
 import { parsePythonVersion } from '../../../client/common/utils/version';
 import { EXTENSION_ROOT_DIR } from '../../../client/constants';
-import { PYTHON_PATH } from '../../common';
+import { getPythonVersion, PYTHON_PATH } from '../../common';
 use(chaiPromised);
 
 // tslint:disable-next-line: max-func-body-length
@@ -42,7 +42,12 @@ suite('Daemon', () => {
                 .trim();
         }
     });
-    setup(() => {
+    setup(function () {
+        const pyVersion = getPythonVersion();
+        if (pyVersion.major === 2) {
+            // tslint:disable-next-line: no-invalid-this
+            return this.skip();
+        }
         // Enable the following to log everything going on at pyton end.
         // pythonProc = spawn(fullyQualifiedPythonPath, ['-m', 'datascience.daemon', '-v', `--log-file=${path.join(EXTENSION_ROOT_DIR, 'test.log')}`], { env });
         pythonProc = spawn(fullyQualifiedPythonPath, ['-m', 'datascience.daemon'], { env });

src/test/common/process/pythonDaemon.functional.test.ts

@@ -26,7 +26,7 @@ import { Architecture } from '../../../client/common/utils/platform';
 import { parsePythonVersion } from '../../../client/common/utils/version';
 import { EXTENSION_ROOT_DIR } from '../../../client/constants';
 import { PythonDaemonModule } from '../../../client/datascience/constants';
-import { PYTHON_PATH, waitForCondition } from '../../common';
+import { getPythonVersion, PYTHON_PATH, waitForCondition } from '../../common';
 use(chaiPromised);
 
 // tslint:disable: max-func-body-length
@@ -53,7 +53,12 @@ suite('Daemon - Python Daemon Pool', () => {
                 .trim();
         }
     });
-    setup(async () => {
+    setup(async function () {
+        const pyVersion = getPythonVersion();
+        if (pyVersion.major === 2){
+            // tslint:disable-next-line: no-invalid-this
+            return this.skip();
+        }
         createDaemonServicesSpy = sinon.spy(DaemonPool.prototype, 'createDaemonServices');
         pythonExecutionService = mock(PythonExecutionService);
         when(pythonExecutionService.execModuleObservable('datascience.daemon', anything(), anything())).thenCall(() => {

src/test/common/process/pythonDaemonPool.functional.test.ts

@@ -3,9 +3,7 @@
 'use strict';
 //tslint:disable:max-func-body-length match-default-export-name no-any no-multiline-string no-trailing-whitespace
 import { expect } from 'chai';
-import rewiremock from 'rewiremock';
 import * as typemoq from 'typemoq';
-
 import { IApplicationShell } from '../../client/common/application/types';
 import {
     IConfigurationService,
@@ -18,6 +16,7 @@ import { Telemetry } from '../../client/datascience/constants';
 import { InteractiveShiftEnterBanner, InteractiveShiftEnterStateKeys } from '../../client/datascience/shiftEnterBanner';
 import { IJupyterExecution } from '../../client/datascience/types';
 import { clearTelemetryReporter } from '../../client/telemetry';
+import { rewiremock } from '../common';
 
 suite('Interactive Shift Enter Banner', () => {
     const oldValueOfVSC_PYTHON_UNIT_TEST = process.env.VSC_PYTHON_UNIT_TEST;

src/test/datascience/shiftEnterBanner.unit.test.ts

@@ -4,8 +4,6 @@
 'use strict';
 
 import * as assert from 'assert';
-// tslint:disable-next-line: match-default-export-name
-import rewiremock from 'rewiremock';
 import { anything, instance, mock, spy, verify, when } from 'ts-mockito';
 import { IExtensionSingleActivationService } from '../../../../client/activation/types';
 import { ApplicationEnvironment } from '../../../../client/common/application/applicationEnvironment';
@@ -26,6 +24,7 @@ import { DebugSessionLoggingFactory } from '../../../../client/debugger/extensio
 import { IDebugAdapterDescriptorFactory, IDebugSessionLoggingFactory } from '../../../../client/debugger/extension/types';
 import { clearTelemetryReporter } from '../../../../client/telemetry';
 import { EventName } from '../../../../client/telemetry/constants';
+import { rewiremock } from '../../../common';
 import { noop } from '../../../core';
 import { MockOutputChannel } from '../../../mockClasses';
 

src/test/debugger/extension/adapter/activator.unit.test.ts

@@ -7,8 +7,6 @@ import * as assert from 'assert';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as path from 'path';
-// tslint:disable-next-line: match-default-export-name
-import rewiremock from 'rewiremock';
 import { SemVer } from 'semver';
 import { anyString, anything, instance, mock, spy, verify, when } from 'ts-mockito';
 import { DebugAdapterExecutable, DebugAdapterServer, DebugConfiguration, DebugSession, WorkspaceFolder } from 'vscode';
@@ -32,6 +30,7 @@ import { IInterpreterService, InterpreterType } from '../../../../client/interpr
 import { InterpreterService } from '../../../../client/interpreter/interpreterService';
 import { clearTelemetryReporter } from '../../../../client/telemetry';
 import { EventName } from '../../../../client/telemetry/constants';
+import { rewiremock } from '../../../common';
 import { MockOutputChannel } from '../../../mockClasses';
 
 use(chaiAsPromised);

src/test/debugger/extension/adapter/factory.unit.test.ts

@@ -3,13 +3,12 @@
 'use strict';
 //tslint:disable:max-func-body-length match-default-export-name no-any no-multiline-string no-trailing-whitespace
 import { expect } from 'chai';
-import rewiremock from 'rewiremock';
 import * as TypeMoq from 'typemoq';
 import { EventEmitter, TextDocument } from 'vscode';
-
 import { IDocumentManager } from '../../client/common/application/types';
 import { EventName } from '../../client/telemetry/constants';
 import { ImportTracker } from '../../client/telemetry/importTracker';
+import { rewiremock } from '../common';
 import { createDocument } from '../datascience/editor-integration/helpers';
 
 suite('Import Tracker', () => {

src/test/telemetry/importTracker.unit.test.ts

@@ -4,15 +4,14 @@
 
 //tslint:disable:max-func-body-length match-default-export-name no-any
 import { expect } from 'chai';
-import rewiremock from 'rewiremock';
-import * as TypeMoq from 'typemoq';
-
 import { instance, mock, verify, when } from 'ts-mockito';
+import * as TypeMoq from 'typemoq';
 import { WorkspaceConfiguration } from 'vscode';
 import { IWorkspaceService } from '../../client/common/application/types';
 import { WorkspaceService } from '../../client/common/application/workspace';
 import { EXTENSION_ROOT_DIR } from '../../client/constants';
 import { clearTelemetryReporter, isTelemetryDisabled, sendTelemetryEvent } from '../../client/telemetry';
+import { rewiremock } from '../common';
 
 suite('Telemetry', () => {
     let workspaceService: IWorkspaceService;