Skip to content

Commit d844e23

Browse files
DonJayamanneDonJayamanne
committed
fixed linter errors
1 parent 5f4f15e commit d844e23

10 files changed

Lines changed: 28 additions & 40 deletions

File tree

‎src/client/unittests/codeLenses/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ export function activateCodeLenses(): vscode.Disposable {
1111
dispose: function () {
1212
disposables.forEach(d => d.dispose());
1313
}
14-
}
14+
};
1515
}

‎src/client/unittests/codeLenses/testFiles.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import * as vscode from 'vscode';
44
import {CodeLensProvider, TextDocument, CancellationToken, CodeLens, SymbolInformation} from 'vscode';
5-
import * as telemetryContracts from '../../common/telemetryContracts';
6-
import {Tests, TestFile, TestsToRun, TestSuite, TestFunction} from '../common/contracts';
5+
import {TestFile, TestsToRun, TestSuite, TestFunction} from '../common/contracts';
76
import * as constants from '../../common/constants';
87
import {getDiscoveredTests} from '../common/testUtils';
98

‎src/client/unittests/common/runner.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {execPythonFile} from './../../common/utils';
2-
import {CancellationToken, OutputChannel, window, workspace} from 'vscode';
3-
import {getPythonInterpreterDirectory, IS_WINDOWS} from '../../common/utils';
1+
import { execPythonFile } from './../../common/utils';
2+
import { CancellationToken, OutputChannel, window, workspace } from 'vscode';
3+
import { getPythonInterpreterDirectory, IS_WINDOWS } from '../../common/utils';
44

55
let terminal = null;
66
export function run(file: string, args: string[], cwd: string, token?: CancellationToken, outChannel?: OutputChannel): Promise<string> {
@@ -18,10 +18,10 @@ function runTestInTerminal(file: string, args: string[], cwd: string): Promise<a
1818
return getPythonInterpreterDirectory().then(pyPath => {
1919
let commands = [];
2020
if (IS_WINDOWS) {
21-
commands.push(`set PATH=%PATH%;${pyPath}`)
21+
commands.push(`set PATH=%PATH%;${pyPath}`);
2222
}
2323
else {
24-
commands.push(`export PATH=$PATH:${pyPath}`)
24+
commands.push(`export PATH=$PATH:${pyPath}`);
2525
}
2626
if (cwd !== workspace.rootPath) {
2727
commands.push(`cd ${cwd}`);

‎src/client/unittests/common/xUnitParser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from 'fs';
22
import * as xml2js from 'xml2js';
3-
import {TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite} from './contracts';
3+
import { Tests, TestStatus } from './contracts';
44

55
export enum PassCalculationFormulae {
66
pytest,

‎src/client/unittests/nosetest/collector.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict';
22
import * as path from 'path';
3-
import {execPythonFile} from './../../common/utils';
4-
import {TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite} from '../common/contracts';
3+
import { execPythonFile } from './../../common/utils';
4+
import { TestFile, TestSuite, TestFunction, Tests } from '../common/contracts';
55
import * as os from 'os';
6-
import {extractBetweenDelimiters, convertFileToPackage, flattenTestFiles} from '../common/testUtils';
7-
import {CancellationToken} from 'vscode';
8-
import {PythonSettings} from '../../common/configSettings';
6+
import { extractBetweenDelimiters, convertFileToPackage, flattenTestFiles } from '../common/testUtils';
7+
import { CancellationToken } from 'vscode';
8+
import { PythonSettings } from '../../common/configSettings';
99

1010
const pythonSettings = PythonSettings.getInstance();
1111

@@ -23,7 +23,6 @@ const settingsInArgsToExcludeForDiscovery = ['--verbosity', '--debug', '--debug-
2323
export function discoverTests(rootDirectory: string, args: string[], token: CancellationToken): Promise<Tests> {
2424
let logOutputLines: string[] = [''];
2525
let testFiles: TestFile[] = [];
26-
let collectionCountReported = false;
2726

2827
// Remove unwanted arguments
2928
args = args.filter(arg => {
@@ -100,9 +99,6 @@ function parseNoseTestModuleCollectionResult(rootDirectory: string, lines: strin
10099
let moduleName = '';
101100
let testFile: TestFile;
102101
lines.forEach(line => {
103-
let x = lines;
104-
let y = x;
105-
106102
if (line.startsWith('nose.selector: DEBUG: wantModule <module \'')) {
107103
fileName = line.substring(line.indexOf('\' from \'') + '\' from \''.length);
108104
fileName = fileName.substring(0, fileName.lastIndexOf('\''));
@@ -116,7 +112,7 @@ function parseNoseTestModuleCollectionResult(rootDirectory: string, lines: strin
116112
fileName = fileName.substring(0, fileName.length - 1);
117113
}
118114
currentPackage = convertFileToPackage(fileName);
119-
const fullyQualifiedName = path.isAbsolute(fileName) ? fileName : path.resolve(rootDirectory, fileName)
115+
const fullyQualifiedName = path.isAbsolute(fileName) ? fileName : path.resolve(rootDirectory, fileName);
120116
testFile = {
121117
functions: [], suites: [], name: fileName, nameToRun: fileName,
122118
xmlName: currentPackage, time: 0, functionsFailed: 0, functionsPassed: 0,

‎src/client/unittests/nosetest/runner.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
'use strict';
2-
import * as path from 'path';
3-
import {createDeferred, createTemporaryFile} from '../../common/helpers';
4-
import {OutputChannel, window, CancellationToken} from 'vscode';
5-
import {TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite} from '../common/contracts';
6-
import * as vscode from 'vscode';
7-
import {extractBetweenDelimiters, convertFileToPackage, flattenTestFiles, updateResults} from '../common/testUtils';
8-
import {BaseTestManager} from '../common/baseTestManager';
2+
import {createTemporaryFile} from '../../common/helpers';
3+
import {OutputChannel, CancellationToken} from 'vscode';
4+
import {TestsToRun, Tests} from '../common/contracts';
5+
import {updateResults} from '../common/testUtils';
96
import {updateResultsFromXmlLogFile, PassCalculationFormulae} from '../common/xUnitParser';
107
import {run} from '../common/runner';
118
import {PythonSettings} from '../../common/configSettings';

‎src/client/unittests/pytest/collector.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22
import { execPythonFile } from './../../common/utils';
3-
import { TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite } from '../common/contracts';
3+
import { TestFile, TestSuite, TestFunction, Tests } from '../common/contracts';
44
import * as os from 'os';
5-
import { extractBetweenDelimiters, flattenTestFiles, updateResults, convertFileToPackage } from '../common/testUtils';
5+
import { extractBetweenDelimiters, flattenTestFiles, convertFileToPackage } from '../common/testUtils';
66
import * as vscode from 'vscode';
77
import * as path from 'path';
88
import { PythonSettings } from '../../common/configSettings';
@@ -23,7 +23,6 @@ export function discoverTests(rootDirectory: string, args: string[], token: vsco
2323
let logOutputLines: string[] = [''];
2424
let testFiles: TestFile[] = [];
2525
let parentNodes: { indent: number, item: TestFile | TestSuite }[] = [];
26-
let collectionCountReported = false;
2726
const errorLine = /==*( *)ERRORS( *)=*/;
2827
const errorFileLine = /__*( *)ERROR collecting (.*)/;
2928
const lastLineWithErrors = /==*.*/;
@@ -98,7 +97,6 @@ export function discoverTests(rootDirectory: string, args: string[], token: vsco
9897
}
9998

10099
const DELIMITER = '\'';
101-
const DEFAULT_CLASS_INDENT = 2;
102100

103101
function parsePyTestModuleCollectionError(rootDirectory: string, lines: string[], testFiles: TestFile[],
104102
parentNodes: { indent: number, item: TestFile | TestSuite }[]) {

‎src/client/unittests/pytest/runner.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/// <reference path="../../../../typings/globals/xml2js/index.d.ts" />
22

33
'use strict';
4-
import { createDeferred, createTemporaryFile } from '../../common/helpers';
5-
import { TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite } from '../common/contracts';
6-
import { extractBetweenDelimiters, flattenTestFiles, updateResults, convertFileToPackage } from '../common/testUtils';
7-
import { BaseTestManager } from '../common/baseTestManager';
4+
import { createTemporaryFile } from '../../common/helpers';
5+
import { TestsToRun, Tests } from '../common/contracts';
6+
import { updateResults } from '../common/testUtils';
87
import { CancellationToken, OutputChannel } from 'vscode';
98
import { updateResultsFromXmlLogFile, PassCalculationFormulae } from '../common/xUnitParser';
109
import { run } from '../common/runner';

‎src/client/unittests/unittest/runner.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
'use strict';
44
import * as path from 'path';
5-
import { createDeferred, createTemporaryFile } from '../../common/helpers';
6-
import { TestFile, TestsToRun, TestSuite, TestFunction, FlattenedTestFunction, Tests, TestStatus, FlattenedTestSuite } from '../common/contracts';
7-
import { extractBetweenDelimiters, flattenTestFiles, updateResults, convertFileToPackage } from '../common/testUtils';
5+
import { TestsToRun, Tests, TestStatus } from '../common/contracts';
6+
import { updateResults } from '../common/testUtils';
87
import { BaseTestManager } from '../common/baseTestManager';
98
import { CancellationToken, OutputChannel } from 'vscode';
109
import { run } from '../common/runner';

‎src/client/unittests/unittest/socketServer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import * as net from 'net';
33
import * as fs from 'fs';
44
import * as os from 'os';
5-
import {Disposable} from 'vscode'
5+
import {Disposable} from 'vscode';
66
import {createDeferred, Deferred} from '../../common/helpers';
77
import {EventEmitter} from 'events';
88

@@ -26,7 +26,7 @@ export class Server extends EventEmitter implements Disposable {
2626
private ipcBuffer: string = '';
2727
constructor() {
2828
super();
29-
this.path = (getIPType() == 'IPv6') ? '::1' : '127.0.0.1';
29+
this.path = (getIPType() === 'IPv6') ? '::1' : '127.0.0.1';
3030
}
3131
public get clientsConnected(): boolean {
3232
return this.sockets.length > 0;
@@ -41,7 +41,7 @@ export class Server extends EventEmitter implements Disposable {
4141
}
4242
}
4343
public start(): Promise<number> {
44-
this.startedDef = createDeferred<number>()
44+
this.startedDef = createDeferred<number>();
4545
fs.unlink(this.path, () => {
4646
this.server = net.createServer(this.connectionListener.bind(this));
4747
this.server.maxConnections = MaxConnections;

0 commit comments

Comments
 (0)