Skip to content

Commit 1ac61ed

Browse files
michelleangelamichelleangela
authored
Revert ignoring failures in E2E tests (#9647)
1 parent 6bd2bb5 commit 1ac61ed

File tree

5 files changed

+106
-101
lines changed

5 files changed

+106
-101
lines changed

‎Extension/test/integrationTests/IntelliSenseFeatures/inlayhints.test.ts

+94-93
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,18 @@ suite("[Inlay hints test]", function(): void {
112112
const result2 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
113113
assert.strictEqual(result2.length, 12, "Incorrect number of results.");
114114
const expectedKind = vscode.InlayHintKind.Type;
115-
assertHintValues(result2[0], 16, 16, ": int *const", expectedKind);
116-
assertHintValues(result2[1], 17, 17, ": const int *const", expectedKind);
117-
assertHintValues(result2[2], 18, 18, ": const int *const &", expectedKind);
118-
assertHintValues(result2[3], 19, 19, ": const int *const", expectedKind);
119-
assertHintValues(result2[4], 20, 17, ": const int", expectedKind);
120-
assertHintValues(result2[5], 21, 12, ": const int &", expectedKind);
121-
assertHintValues(result2[6], 22, 21, ": const int &", expectedKind);
122-
assertHintValues(result2[7], 23, 21, ": const int *", expectedKind);
123-
assertHintValues(result2[8], 24, 21, ": int *", expectedKind);
124-
assertHintValues(result2[9], 25, 21, ": const int *", expectedKind);
125-
assertHintValues(result2[10], 28, 14, ": int", expectedKind);
126-
assertHintValues(result2[11], 29, 15, ": int", expectedKind);
115+
assertHintValues(result2, 0, 16, 16, ": int *const", expectedKind);
116+
assertHintValues(result2, 1, 17, 17, ": const int *const", expectedKind);
117+
assertHintValues(result2, 2, 18, 18, ": const int *const &", expectedKind);
118+
assertHintValues(result2, 3, 19, 19, ": const int *const", expectedKind);
119+
assertHintValues(result2, 4, 20, 17, ": const int", expectedKind);
120+
assertHintValues(result2, 5, 21, 12, ": const int &", expectedKind);
121+
assertHintValues(result2, 6, 22, 21, ": const int &", expectedKind);
122+
assertHintValues(result2, 7, 23, 21, ": const int *", expectedKind);
123+
assertHintValues(result2, 8, 24, 21, ": int *", expectedKind);
124+
assertHintValues(result2, 9, 25, 21, ": const int *", expectedKind);
125+
assertHintValues(result2, 10, 28, 14, ": int", expectedKind);
126+
assertHintValues(result2, 11, 29, 15, ": int", expectedKind);
127127
});
128128

129129
test("[Inlay Hints - auto type, show on left]", async () => {
@@ -141,18 +141,18 @@ suite("[Inlay hints test]", function(): void {
141141
const result2 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
142142
assert.strictEqual(result2.length, 12, "Incorrect number of results.");
143143
const expectedKind = vscode.InlayHintKind.Type;
144-
assertHintValues(result2[0], 16, 15, "int *const", expectedKind);
145-
assertHintValues(result2[1], 17, 15, "const int *const", expectedKind);
146-
assertHintValues(result2[2], 18, 16, "const int *const &", expectedKind);
147-
assertHintValues(result2[3], 19, 17, "const int *const", expectedKind);
148-
assertHintValues(result2[4], 20, 15, "const int", expectedKind);
149-
assertHintValues(result2[5], 21, 10, "const int &", expectedKind);
150-
assertHintValues(result2[6], 22, 19, "const int &", expectedKind);
151-
assertHintValues(result2[7], 23, 19, "const int *", expectedKind);
152-
assertHintValues(result2[8], 24, 19, "int *", expectedKind);
153-
assertHintValues(result2[9], 25, 19, "const int *", expectedKind);
154-
assertHintValues(result2[10], 28, 9, "int", expectedKind);
155-
assertHintValues(result2[11], 29, 14, "int", expectedKind);
144+
assertHintValues(result2, 0, 16, 15, "int *const", expectedKind);
145+
assertHintValues(result2, 1, 17, 15, "const int *const", expectedKind);
146+
assertHintValues(result2, 2, 18, 16, "const int *const &", expectedKind);
147+
assertHintValues(result2, 3, 19, 17, "const int *const", expectedKind);
148+
assertHintValues(result2, 4, 20, 15, "const int", expectedKind);
149+
assertHintValues(result2, 5, 21, 10, "const int &", expectedKind);
150+
assertHintValues(result2, 6, 22, 19, "const int &", expectedKind);
151+
assertHintValues(result2, 7, 23, 19, "const int *", expectedKind);
152+
assertHintValues(result2, 8, 24, 19, "int *", expectedKind);
153+
assertHintValues(result2, 9, 25, 19, "const int *", expectedKind);
154+
assertHintValues(result2, 10, 28, 9, "int", expectedKind);
155+
assertHintValues(result2, 11, 29, 14, "int", expectedKind);
156156
});
157157

158158
test("[Inlay Hints - parameter names]", async () => {
@@ -170,22 +170,22 @@ suite("[Inlay hints test]", function(): void {
170170
const result2 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
171171
assert.strictEqual(result2.length, 16, "Incorrect number of results.");
172172
const expectedKind = vscode.InlayHintKind.Parameter;
173-
assertHintValues(result2[0], 16, 15, "width:", expectedKind);
174-
assertHintValues(result2[1], 17, 15, "height:", expectedKind);
175-
assertHintValues(result2[2], 18, 16, "width:", expectedKind);
176-
assertHintValues(result2[3], 19, 17, "height:", expectedKind);
177-
assertHintValues(result2[4], 20, 15, "width:", expectedKind);
178-
assertHintValues(result2[5], 21, 10, "height:", expectedKind);
179-
assertHintValues(result2[6], 22, 19, "height:", expectedKind);
180-
assertHintValues(result2[7], 23, 19, "height:", expectedKind);
181-
assertHintValues(result2[8], 24, 19, "height:", expectedKind);
182-
assertHintValues(result2[9], 25, 19, "height:", expectedKind);
183-
assertHintValues(result2[10], 28, 9, "height:", expectedKind);
184-
assertHintValues(result2[11], 29, 14, "width:", expectedKind);
185-
assertHintValues(result2[12], 29, 14, "width:", expectedKind);
186-
assertHintValues(result2[13], 28, 9, "width:", expectedKind);
187-
assertHintValues(result2[14], 29, 14, "width:", expectedKind);
188-
assertHintValues(result2[15], 29, 14, "width:", expectedKind);
173+
assertHintValues(result2, 0, 41, 17, "width:", expectedKind);
174+
assertHintValues(result2, 1, 41, 20, "height:", expectedKind);
175+
assertHintValues(result2, 2, 42, 17, "width:", expectedKind);
176+
assertHintValues(result2, 3, 43, 17, "height:", expectedKind);
177+
assertHintValues(result2, 4, 45, 17, "width:", expectedKind);
178+
assertHintValues(result2, 5, 46, 17, "height:", expectedKind);
179+
assertHintValues(result2, 6, 50, 20, "height:", expectedKind);
180+
assertHintValues(result2, 7, 51, 26, "height:", expectedKind);
181+
assertHintValues(result2, 8, 52, 29, "height:", expectedKind);
182+
assertHintValues(result2, 9, 54, 13, "height:", expectedKind);
183+
assertHintValues(result2, 10, 57, 13, "height:", expectedKind);
184+
assertHintValues(result2, 11, 61, 13, "width:", expectedKind);
185+
assertHintValues(result2, 12, 62, 13, "width:", expectedKind);
186+
assertHintValues(result2, 13, 63, 16, "width:", expectedKind);
187+
assertHintValues(result2, 14, 64, 13, "width:", expectedKind);
188+
assertHintValues(result2, 15, 67, 13, "width:", expectedKind);
189189
});
190190

191191
test("[Inlay Hints - parameter hideLeadingUnderscores]", async () => {
@@ -197,19 +197,19 @@ suite("[Inlay hints test]", function(): void {
197197
const result1 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
198198
assert.strictEqual(result1.length, 4, "Incorrect number of results.");
199199
const expectedKind = vscode.InlayHintKind.Parameter;
200-
assertHintValues(result1[0], 35, 16, "___x:", expectedKind);
201-
assertHintValues(result1[1], 35, 19, "__y:", expectedKind);
202-
assertHintValues(result1[2], 35, 22, "_z:", expectedKind);
203-
assertHintValues(result1[3], 35, 25, "a:", expectedKind);
200+
assertHintValues(result1, 0, 35, 16, "___x:", expectedKind);
201+
assertHintValues(result1, 1, 35, 19, "__y:", expectedKind);
202+
assertHintValues(result1, 2, 35, 22, "_z:", expectedKind);
203+
assertHintValues(result1, 3, 35, 25, "a:", expectedKind);
204204

205205
await changeInlayHintSetting(parameterNamesHideUnderScore, enabled);
206206
await getIntelliSenseStatus;
207207
const result2 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
208208
assert.strictEqual(result2.length, 4, "Incorrect number of results.");
209-
assertHintValues(result2[0], 35, 16, "x:", expectedKind);
210-
assertHintValues(result2[1], 35, 19, "y:", expectedKind);
211-
assertHintValues(result2[2], 35, 22, "z:", expectedKind);
212-
assertHintValues(result2[3], 35, 25, "a:", expectedKind);
209+
assertHintValues(result2, 0, 35, 16, "x:", expectedKind);
210+
assertHintValues(result2, 1, 35, 19, "y:", expectedKind);
211+
assertHintValues(result2, 2, 35, 22, "z:", expectedKind);
212+
assertHintValues(result2, 3, 35, 25, "a:", expectedKind);
213213
});
214214

215215
test("[Inlay Hints - reference operator]", async () => {
@@ -228,22 +228,22 @@ suite("[Inlay hints test]", function(): void {
228228
assert.strictEqual(result2.length, 16, "Incorrect number of results.");
229229
const expectedKind = vscode.InlayHintKind.Parameter;
230230
const refOp: string = "&:";
231-
assertHintValues(result2[0], 87, 9, refOp, expectedKind);
232-
assertHintValues(result2[1], 87, 12, refOp, expectedKind);
233-
assertHintValues(result2[2], 88, 9, refOp, expectedKind);
234-
assertHintValues(result2[3], 88, 22, refOp, expectedKind);
235-
assertHintValues(result2[4], 89, 9, refOp, expectedKind);
236-
assertHintValues(result2[5], 90, 9, refOp, expectedKind);
237-
assertHintValues(result2[6], 93, 9, refOp, expectedKind);
238-
assertHintValues(result2[7], 94, 9, refOp, expectedKind);
239-
assertHintValues(result2[8], 97, 9, refOp, expectedKind);
240-
assertHintValues(result2[9], 97, 12, refOp, expectedKind);
241-
assertHintValues(result2[10], 98, 9, refOp, expectedKind);
242-
assertHintValues(result2[11], 98, 12, refOp, expectedKind);
243-
assertHintValues(result2[12], 99, 9, refOp, expectedKind);
244-
assertHintValues(result2[13], 100, 9, refOp, expectedKind);
245-
assertHintValues(result2[14], 103, 9, refOp, expectedKind);
246-
assertHintValues(result2[15], 104, 9, refOp, expectedKind);
231+
assertHintValues(result2, 0, 87, 9, refOp, expectedKind);
232+
assertHintValues(result2, 1, 87, 12, refOp, expectedKind);
233+
assertHintValues(result2, 2, 88, 9, refOp, expectedKind);
234+
assertHintValues(result2, 3, 88, 22, refOp, expectedKind);
235+
assertHintValues(result2, 4, 89, 9, refOp, expectedKind);
236+
assertHintValues(result2, 5, 90, 9, refOp, expectedKind);
237+
assertHintValues(result2, 6, 93, 9, refOp, expectedKind);
238+
assertHintValues(result2, 7, 94, 9, refOp, expectedKind);
239+
assertHintValues(result2, 8, 97, 9, refOp, expectedKind);
240+
assertHintValues(result2, 9, 97, 12, refOp, expectedKind);
241+
assertHintValues(result2, 10, 98, 9, refOp, expectedKind);
242+
assertHintValues(result2, 11, 98, 12, refOp, expectedKind);
243+
assertHintValues(result2, 12, 99, 9, refOp, expectedKind);
244+
assertHintValues(result2, 13, 100, 9, refOp, expectedKind);
245+
assertHintValues(result2, 14, 103, 9, refOp, expectedKind);
246+
assertHintValues(result2, 15, 104, 9, refOp, expectedKind);
247247
});
248248

249249
test("[Inlay Hints - reference operator and param name, show space]", async () => {
@@ -258,35 +258,35 @@ suite("[Inlay hints test]", function(): void {
258258
const result1 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
259259
assert.strictEqual(result1.length, 12, "Incorrect number of results.");
260260
const expectedKind = vscode.InlayHintKind.Parameter;
261-
assertHintValues(result1[0], 87, 9, "&first:", expectedKind);
262-
assertHintValues(result1[1], 87, 12, "&last:", expectedKind);
263-
assertHintValues(result1[2], 87, 15, "flag:", expectedKind);
264-
assertHintValues(result1[3], 88, 9, "&first:", expectedKind);
265-
assertHintValues(result1[4], 88, 22, "&last:", expectedKind);
266-
assertHintValues(result1[5], 88, 25, "flag:", expectedKind);
267-
assertHintValues(result1[6], 89, 9, "&first:", expectedKind);
268-
assertHintValues(result1[7], 90, 9, "&last:", expectedKind);
269-
assertHintValues(result1[8], 91, 9, "flag:", expectedKind);
270-
assertHintValues(result1[9], 93, 9, "&first:", expectedKind);
271-
assertHintValues(result1[10], 94, 9, "&last:", expectedKind);
272-
assertHintValues(result1[11], 95, 9, "flag:", expectedKind);
261+
assertHintValues(result1, 0, 87, 9, "&first:", expectedKind);
262+
assertHintValues(result1, 1, 87, 12, "&last:", expectedKind);
263+
assertHintValues(result1, 2, 87, 15, "flag:", expectedKind);
264+
assertHintValues(result1, 3, 88, 9, "&first:", expectedKind);
265+
assertHintValues(result1, 4, 88, 22, "&last:", expectedKind);
266+
assertHintValues(result1, 5, 88, 25, "flag:", expectedKind);
267+
assertHintValues(result1, 6, 89, 9, "&first:", expectedKind);
268+
assertHintValues(result1, 7, 90, 9, "&last:", expectedKind);
269+
assertHintValues(result1, 8, 91, 9, "flag:", expectedKind);
270+
assertHintValues(result1, 9, 93, 9, "&first:", expectedKind);
271+
assertHintValues(result1, 10, 94, 9, "&last:", expectedKind);
272+
assertHintValues(result1, 11, 95, 9, "flag:", expectedKind);
273273

274274
await changeInlayHintSetting(referenceOperatorShowSpace, enabled);
275275
await getIntelliSenseStatus;
276276
const result2 = await vscode.commands.executeCommand<vscode.InlayHint[]>('vscode.executeInlayHintProvider', fileUri, range);
277277
assert.strictEqual(result2.length, 12, "Incorrect number of results.");
278-
assertHintValues(result2[0], 87, 9, "& first:", expectedKind);
279-
assertHintValues(result2[1], 87, 12, "& last:", expectedKind);
280-
assertHintValues(result2[2], 87, 15, "flag:", expectedKind);
281-
assertHintValues(result2[3], 88, 9, "& first:", expectedKind);
282-
assertHintValues(result2[4], 88, 22, "& last:", expectedKind);
283-
assertHintValues(result2[5], 88, 25, "flag:", expectedKind);
284-
assertHintValues(result2[6], 89, 9, "& first:", expectedKind);
285-
assertHintValues(result2[7], 90, 9, "& last:", expectedKind);
286-
assertHintValues(result2[8], 91, 9, "flag:", expectedKind);
287-
assertHintValues(result2[9], 93, 9, "& first:", expectedKind);
288-
assertHintValues(result2[10], 94, 9, "& last:", expectedKind);
289-
assertHintValues(result2[11], 95, 9, "flag:", expectedKind);
278+
assertHintValues(result2, 0, 87, 9, "& first:", expectedKind);
279+
assertHintValues(result2, 1, 87, 12, "& last:", expectedKind);
280+
assertHintValues(result2, 2, 87, 15, "flag:", expectedKind);
281+
assertHintValues(result2, 3, 88, 9, "& first:", expectedKind);
282+
assertHintValues(result2, 4, 88, 22, "& last:", expectedKind);
283+
assertHintValues(result2, 5, 88, 25, "flag:", expectedKind);
284+
assertHintValues(result2, 6, 89, 9, "& first:", expectedKind);
285+
assertHintValues(result2, 7, 90, 9, "& last:", expectedKind);
286+
assertHintValues(result2, 8, 91, 9, "flag:", expectedKind);
287+
assertHintValues(result2, 9, 93, 9, "& first:", expectedKind);
288+
assertHintValues(result2, 10, 94, 9, "& last:", expectedKind);
289+
assertHintValues(result2, 11, 95, 9, "flag:", expectedKind);
290290
});
291291

292292
async function changeInlayHintSetting(inlayHintSetting: string, valueNew: any): Promise<void> {
@@ -299,14 +299,15 @@ suite("[Inlay hints test]", function(): void {
299299
}
300300

301301
function assertHintValues(
302-
actualHint: any,
302+
actualHintResults: any,
303+
resultNumber: number,
303304
expectedLine: number,
304305
expectedCharacter: number,
305306
expectedLabel: string,
306307
expectedKind: any): void {
307-
assert.strictEqual(actualHint.position.line, expectedLine, "Incorrect line.");
308-
assert.strictEqual(actualHint.position.character, expectedCharacter, "Incorrect character.");
309-
assert.strictEqual(actualHint.label, expectedLabel, "Incorrect label.");
310-
assert.strictEqual(actualHint.kind, expectedKind, "Incorrect kind.");
308+
assert.strictEqual(actualHintResults[resultNumber].position.line, expectedLine, `Incorrect line for result ${resultNumber}.`);
309+
assert.strictEqual(actualHintResults[resultNumber].position.character, expectedCharacter, `Incorrect character for result ${resultNumber}.`);
310+
assert.strictEqual(actualHintResults[resultNumber].label, expectedLabel, `Incorrect label for result ${resultNumber}.`);
311+
assert.strictEqual(actualHintResults[resultNumber].kind, expectedKind, `Incorrect kind for result ${resultNumber}.`);
311312
}
312313
});

‎Extension/test/integrationTests/IntelliSenseFeatures/runTest.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ async function main() {
2626
// Download VS Code, unzip it and run the integration test
2727
await runTests({ launchArgs, extensionDevelopmentPath, extensionTestsPath });
2828
} catch (err) {
29-
console.log('VS Code returned an unexpected error code, ignore it');
30-
process.exit(0);
29+
console.log(err);
30+
console.log('Failed to run tests.');
31+
process.exit(1);
3132
}
3233
}
3334

‎Extension/test/integrationTests/debug/runTest.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ async function main() {
1717
// Download VS Code, unzip it and run the integration test
1818
await runTests({ launchArgs, extensionDevelopmentPath, extensionTestsPath });
1919
} catch(err) {
20-
console.log('VS Code returned an unexpected error code, ignore it');
21-
process.exit(0);
20+
console.log(err);
21+
console.log('Failed to run tests.');
22+
process.exit(1);
2223
}
2324
}
2425

‎Extension/test/integrationTests/languageServer/runTest.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ async function main() {
1919
// Download VS Code, unzip it and run the integration test
2020
await runTests({ launchArgs, extensionDevelopmentPath, extensionTestsPath });
2121
} catch (err) {
22-
console.log('VS Code returned an unexpected error code, ignore it');
23-
process.exit(0);
22+
console.log(err);
23+
console.log('Failed to run tests.');
24+
process.exit(1);
2425
}
2526
}
2627

‎Extension/test/unitTests/runTest.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ async function main() {
1717
// Download VS Code, unzip it and run the integration test
1818
await runTests({ launchArgs, extensionDevelopmentPath, extensionTestsPath });
1919
} catch (err) {
20-
console.log('VS Code returned an unexpected error code, ignore it');
21-
process.exit(0);
20+
console.log(err);
21+
console.log('Failed to run tests.');
22+
process.exit(1);
2223
}
2324
}
2425

0 commit comments

Comments
 (0)