Skip to content

Commit 2332afb

Browse files
DonJayamanneDonJayamanne
committed
testing with virtual envs #160
1 parent 426f6c9 commit 2332afb

3 files changed

Lines changed: 25 additions & 42 deletions

File tree

‎src/test/extension.common.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ suite("ChildProc", () => {
2020
test("Standard Response", done => {
2121
execPythonFile("python", ["-c", "print(1)"], __dirname, false).then(data => {
2222
assert.ok(data === "1\n");
23-
}).then(done, error => { assert.ok(false, error); done(); });
23+
}).then(done, done);
2424
});
2525
test("Error Response", done => {
2626
execPythonFile("python", ["-c", "print(1"], __dirname, false).then(data => {
2727
assert.ok(false);
2828
}).catch(() => {
2929
assert.ok(true);
30-
}).then(done, error => { assert.ok(false, error); done(); });
30+
}).then(done, done);
3131
});
3232
});

‎src/test/extension.format.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ suite("Formatting", () => {
5353
}
5454
assert.equal(textEditor.document.getText(), data, "Formatted text is not the same");
5555
});
56-
}).then(done, error => { assert.ok(false, error); done(); });
56+
}).then(done, done);
5757
});
5858

5959
test("Yapf", done => {
@@ -79,7 +79,7 @@ suite("Formatting", () => {
7979
}
8080
assert.equal(textEditor.document.getText(), data, "Formatted text is not the same");
8181
});
82-
}).then(done, error => { assert.ok(false, error); done(); });
82+
}).then(done, done);
8383
});
8484

8585
test("Yapf autoformat on save", done => {
@@ -111,6 +111,6 @@ suite("Formatting", () => {
111111
});
112112
}).then(() => {
113113
assert.equal(textDocument.getText(), formattedFileContents, "Formatted contents are not the same");
114-
}).then(done, error => { assert.ok(false, error); done(); });
114+
}).then(done, done);
115115
});
116116
});

‎src/test/extension.lint.test.ts‎

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ suite("Linting", () => {
5656
assert.equal(pythonSettings.linting.pep8Enabled, linter.isEnabled());
5757
});
5858
test("PyLint", done => {
59-
let messagesToBeReturned2: baseLinter.ILintMessage[] = [
59+
let messagesToBeReturned: baseLinter.ILintMessage[] = [
6060
{ line: 17, column: 0, severity: baseLinter.LintMessageSeverity.Information, code: "I0011", message: "Locally disabling unused-argument (W0613)", possibleWord: "", provider: "", type: "" },
6161
{ line: 24, column: 0, severity: baseLinter.LintMessageSeverity.Information, code: "I0011", message: "Locally disabling no-member (E1101)", possibleWord: "", provider: "", type: "" },
6262
{ line: 30, column: 0, severity: baseLinter.LintMessageSeverity.Information, code: "I0011", message: "Locally disabling no-member (E1101)", possibleWord: "", provider: "", type: "" },
@@ -80,53 +80,36 @@ suite("Linting", () => {
8080
{ line: 77, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
8181
{ line: 83, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" }
8282
];
83-
let messagesToBeReturned3: baseLinter.ILintMessage[] = [
84-
{ line: 13, column: 0, severity: baseLinter.LintMessageSeverity.Error, code: "E0001", message: "Missing parentheses in call to 'print'", possibleWord: "", provider: "", type: "" }
85-
];
8683
let linter = new pyLint.Linter(ch, __dirname);
87-
return execPythonFile(pythonSettings.pythonPath, ["--version"], __dirname, true).then(data => {
88-
let majorVersion = data.indexOf("3.5") >= 0 ? 3 : 2;
89-
return majorVersion === 2 ? messagesToBeReturned2 : messagesToBeReturned3;
90-
}).then(messagesToBeReturned => {
91-
return Promise.all<baseLinter.ILintMessage[]>([Promise.resolve(messagesToBeReturned), linter.runLinter(pyLintFileToLint, pylintFileToLintLines)]);
92-
}).then(msgs => {
93-
let messagesToBeReturned = msgs[0];
94-
let messages = msgs[1];
84+
return linter.runLinter(pyLintFileToLint, pylintFileToLintLines).then(messages => {
9585
assert.equal(messagesToBeReturned.length, messages.length, "Incorrect number of errors");
9686
messagesToBeReturned.forEach(msg => {
9787
let similarMessages = messages.filter(m => m.code === msg.code && m.column === msg.column &&
9888
m.line === msg.line && m.message === msg.message && m.severity === msg.severity);
9989
assert.equal(1, similarMessages.length, "Error not found, " + JSON.stringify(msg));
10090
});
101-
}).then(done, error => { assert.ok(false, error); done(); });
91+
}).then(done, done);
10292
});
10393
test("PyLint with config in root", done => {
94+
let messagesToBeReturned: baseLinter.ILintMessage[] = [
95+
{ line: 26, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blop' member", possibleWord: "", provider: "", type: "" },
96+
{ line: 36, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
97+
{ line: 46, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
98+
{ line: 61, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
99+
{ line: 72, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
100+
{ line: 75, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
101+
{ line: 77, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
102+
{ line: 83, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" }
103+
];
104104
let rootDirContainingConfig = path.join(__dirname, "..", "..", "src", "test", "pythonFiles", "linting", "pylintcfg");
105105
let linter = new pyLint.Linter(ch, rootDirContainingConfig);
106-
linter.runLinter(pyLintFileToLint, pylintFileToLintLines).then(messages => {
107-
return execPythonFile(pythonSettings.pythonPath, ["--version"], __dirname, true).then(data => {
108-
return data.indexOf("3.5") >= 0 ? 3 : 2;
109-
}).then(majorVersion => {
110-
let messagesToBeReturned2: baseLinter.ILintMessage[] = [
111-
{ line: 26, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blop' member", possibleWord: "", provider: "", type: "" },
112-
{ line: 36, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
113-
{ line: 46, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
114-
{ line: 61, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
115-
{ line: 72, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
116-
{ line: 75, column: 18, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
117-
{ line: 77, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" },
118-
{ line: 83, column: 14, severity: baseLinter.LintMessageSeverity.Error, code: "E1101", message: "Instance of 'Foo' has no 'blip' member", possibleWord: "", provider: "", type: "" }
119-
];
120-
let messagesToBeReturned3: baseLinter.ILintMessage[] = [];
121-
let messagesToBeReturned = majorVersion === 2 ? messagesToBeReturned2 : messagesToBeReturned3;
122-
123-
assert.equal(messagesToBeReturned.length, messages.length, "Incorrect number of errors");
124-
messagesToBeReturned.forEach(msg => {
125-
let similarMessages = messages.filter(m => m.code === msg.code && m.column === msg.column &&
126-
m.line === msg.line && m.message === msg.message && m.severity === msg.severity);
127-
assert.equal(1, similarMessages.length, "Error not found, " + JSON.stringify(msg));
128-
});
106+
return linter.runLinter(pyLintFileToLint, pylintFileToLintLines).then(messages => {
107+
assert.equal(messagesToBeReturned.length, messages.length, "Incorrect number of errors");
108+
messagesToBeReturned.forEach(msg => {
109+
let similarMessages = messages.filter(m => m.code === msg.code && m.column === msg.column &&
110+
m.line === msg.line && m.message === msg.message && m.severity === msg.severity);
111+
assert.equal(1, similarMessages.length, "Error not found, " + JSON.stringify(msg));
129112
});
130-
}).then(done, error => { assert.ok(false, error); done(); });
113+
}).then(done, done);
131114
});
132115
});

0 commit comments

Comments
 (0)