Platform tests

Author: MikhailArkhipov

src/client/common/platform/types.ts

@@ -60,8 +60,3 @@ export interface IOperatingSystem {
     release(): string;
     arch(): string;
 }
-
-export const ICurrentProcess = Symbol('ICurrentProcess');
-export interface ICurrentProcess {
-    readonly platform: string;
-}

src/test/common/platform/platform.unit.test.ts

@@ -1,21 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { expect, use } from 'chai';
-import * as fs from 'fs-extra';
-import * as path from 'path';
+import { expect } from 'chai';
 import * as TypeMoq from 'typemoq';
 import { Container } from '../../../../node_modules/inversify';
-import { FileSystem } from '../../../client/common/platform/fileSystem';
 import { PlatformService } from '../../../client/common/platform/platformService';
-import { ICurrentProcess, IFileSystem, IOperatingSystem, IPlatformService } from '../../../client/common/platform/types';
+import { IOperatingSystem } from '../../../client/common/platform/types';
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
-import { IAnalysisSettings, IConfigurationService, IPythonSettings } from '../../../client/common/types';
+import { IAnalysisSettings, IConfigurationService, ICurrentProcess, IPythonSettings } from '../../../client/common/types';
 import { ServiceContainer } from '../../../client/ioc/container';
 import { ServiceManager } from '../../../client/ioc/serviceManager';
-// tslint:disable-next-line:no-require-imports no-var-requires
-const assertArrays = require('chai-arrays');
-use(assertArrays);
 
 // tslint:disable-next-line:max-func-body-length
 suite('Platform', () => {
@@ -26,11 +20,12 @@ suite('Platform', () => {
     let analysisSettings: TypeMoq.IMock<IAnalysisSettings>;
     let execFactory: TypeMoq.IMock<IPythonExecutionFactory>;
     let exec: TypeMoq.IMock<IPythonExecutionService>;
+    let serviceManager: ServiceManager;
     let serviceContainer: ServiceContainer;
 
     setup(() => {
         const cont = new Container();
-        const serviceManager = new ServiceManager(cont);
+        serviceManager = new ServiceManager(cont);
         serviceContainer = new ServiceContainer(cont);
 
         process = TypeMoq.Mock.ofType<ICurrentProcess>();
@@ -41,9 +36,6 @@ suite('Platform', () => {
         execFactory = TypeMoq.Mock.ofType<IPythonExecutionFactory>();
         exec = TypeMoq.Mock.ofType<IPythonExecutionService>();
 
-        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
-        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
-
         pythonSettings.setup(x => x.analysis).returns(() => analysisSettings.object);
         config.setup(x => x.getSettings(TypeMoq.It.isAny())).returns(() => pythonSettings.object);
         serviceManager.addSingletonInstance(IConfigurationService, config.object);
@@ -52,20 +44,55 @@ suite('Platform', () => {
         serviceManager.addSingletonInstance(IPythonExecutionFactory, execFactory.object);
     });
     test('Windows platform check', async () => {
+        process.setup(x => x.platform).returns(() => 'win32');
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
         const platform = new PlatformService(serviceContainer);
-        process.setup(x => x.platform).returns(() => 'win');
+
         expect(platform.isWindows).to.be.equal(true, 'Platform must be Windows');
-        expect(platform.isMac).to.be.equal(true, 'Platform must not be Mac');
-        expect(platform.isLinux).to.be.equal(true, 'Platform must not be Linux');
+        expect(platform.isMac).to.be.equal(false, 'Platform must not be Mac');
+        expect(platform.isLinux).to.be.equal(false, 'Platform must not be Linux');
     });
-    test('32-bit platform check', async () => {
+    test('Mac platform check', async () => {
+        process.setup(x => x.platform).returns(() => 'darwin');
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
         const platform = new PlatformService(serviceContainer);
+
+        expect(platform.isMac).to.be.equal(true, 'Platform must be Mac');
+        expect(platform.isWindows).to.be.equal(false, 'Platform must not be Windows');
+        expect(platform.isLinux).to.be.equal(false, 'Platform must not be Linux');
+    });
+    test('32-bit platform check', async () => {
         os.setup(x => x.arch()).returns(() => '');
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        const platform = new PlatformService(serviceContainer);
+
         expect(platform.is64bit).to.be.equal(false, 'Platform must not be x64');
     });
     test('64-bit platform check', async () => {
-        const platform = new PlatformService(serviceContainer);
         os.setup(x => x.arch()).returns(() => 'x64');
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        const platform = new PlatformService(serviceContainer);
+
         expect(platform.is64bit).to.be.equal(true, 'Platform must be x64');
     });
+    test('bin/scripts check (Windows)', async () => {
+        process.setup(x => x.platform).returns(() => 'win32');
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
+        const platform = new PlatformService(serviceContainer);
+
+        expect(platform.virtualEnvBinName).to.be.equal('scripts', 'Venv bin must be scripts on Windows');
+    });
+    test('bin/scripts check (Mac/Linux)', async () => {
+        process.setup(x => x.platform).returns(() => 'darwin');
+        serviceManager.addSingletonInstance(ICurrentProcess, process.object);
+        serviceManager.addSingletonInstance(IOperatingSystem, os.object);
+        const platform = new PlatformService(serviceContainer);
+
+        expect(platform.virtualEnvBinName).to.be.equal('bin', 'Venv bin must be scripts on Mac');
+    });
 });

src/test/index.ts

@@ -18,7 +18,7 @@ process.env.IS_MULTI_ROOT_TEST = IS_MULTI_ROOT_TEST.toString();
 // If running on CI server and we're running the debugger tests, then ensure we only run debug tests.
 // We do this to ensure we only run debugger test, as debugger tests are very flaky on CI.
 // So the solution is to run them separately and first on CI.
-const grep = IS_CI_SERVER && IS_CI_SERVER_TEST_DEBUGGER ? 'Debug' : undefined;
+const grep = IS_CI_SERVER && IS_CI_SERVER_TEST_DEBUGGER ? 'Debug' : 'Platform';
 const testFilesSuffix = process.env.TEST_FILES_SUFFIX;
 
 // You can directly control Mocha options by uncommenting the following lines.