Skip to content

Commit 78981d4

Browse files
committed
check version of python after initializing setting
1 parent c1fdb5b commit 78981d4

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

src/test/extension.lint.test.ts

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ let pylintMessagesToBeReturned: baseLinter.ILintMessage[] = [
7373
{ line: 83, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: 'E1101', message: 'Instance of \'Foo\' has no \'blip\' member', possibleWord: '', provider: '', type: '' }
7474
];
7575
let pyLint3MessagesToBeReturned: baseLinter.ILintMessage[] = [
76-
{ line: 18, column: 0, severity: baseLinter.LintMessageSeverity.Error, code: 'E0001', message: 'Missing parentheses in call to \'print\'', possibleWord: '', provider: '', type: '' }
76+
{ line: 13, column: 0, severity: baseLinter.LintMessageSeverity.Error, code: 'E0001', message: 'Missing parentheses in call to \'print\'', possibleWord: '', provider: '', type: '' }
7777
];
7878
let flake8MessagesToBeReturned: baseLinter.ILintMessage[] = [
7979
{ line: 5, column: 1, severity: baseLinter.LintMessageSeverity.Information, code: 'E302', message: 'expected 2 blank lines, found 1', possibleWord: '', provider: '', type: '' },
@@ -140,13 +140,16 @@ let fiteredPydocstyleMessagseToBeReturned: baseLinter.ILintMessage[] = [
140140

141141
suiteSetup(done => {
142142
pylintFileToLintLines = fs.readFileSync(fileToLint).toString('utf-8').split(/\r?\n/g);
143-
execPythonFile('python', ['--version'], __dirname, true).then(value => {
144-
isPython3 = value.indexOf('3.') >= 0;
145-
if (isPython3) {
146-
pylintMessagesToBeReturned = pyLint3MessagesToBeReturned;
147-
filteredPylintMessagesToBeReturned = filteredPylint3MessagesToBeReturned;
148-
}
149-
done();
143+
initialize().then(() => {
144+
pythonSettings.pythonPath = '/Users/donjayamanne/Desktop/Development/Python/Temp/MyEnvs/p3/bin/python';
145+
execPythonFile('python', ['--version'], __dirname, true).then(value => {
146+
isPython3 = value.indexOf('3.') >= 0;
147+
if (isPython3) {
148+
pylintMessagesToBeReturned = pyLint3MessagesToBeReturned;
149+
filteredPylintMessagesToBeReturned = filteredPylint3MessagesToBeReturned;
150+
}
151+
done();
152+
});
150153
});
151154
});
152155
suiteTeardown(done => {
@@ -155,15 +158,13 @@ suiteTeardown(done => {
155158
});
156159

157160
suite('Linting', () => {
158-
setup(done => {
159-
initialize().then(() => {
160-
pythonSettings.linting.enabled = true;
161-
pythonSettings.linting.pylintEnabled = true;
162-
pythonSettings.linting.flake8Enabled = true;
163-
pythonSettings.linting.pep8Enabled = true;
164-
pythonSettings.linting.prospectorEnabled = true;
165-
pythonSettings.linting.pydocstyleEnabled = true;
166-
}).then(done, done);
161+
setup(() => {
162+
pythonSettings.linting.enabled = true;
163+
pythonSettings.linting.pylintEnabled = true;
164+
pythonSettings.linting.flake8Enabled = true;
165+
pythonSettings.linting.pep8Enabled = true;
166+
pythonSettings.linting.prospectorEnabled = true;
167+
pythonSettings.linting.pydocstyleEnabled = true;
167168
});
168169

169170
function testEnablingDisablingOfLinter(linter: baseLinter.BaseLinter, propertyName: string) {

0 commit comments

Comments
 (0)