Skip to content

Commit c43e6bb

Browse files
fix: Make tests more robust & fix path bug
1 parent a29134b commit c43e6bb

10 files changed

Lines changed: 551 additions & 55 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ yarn-debug.log*
66
yarn-error.log*
77
lerna-debug.log*
88

9+
# Editor files
10+
.idea/
11+
912
# Diagnostic reports (https://nodejs.org/api/report.html)
1013
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
1114

packages/pyright-internal/src/analyzer/program.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,15 @@ export class Program {
331331

332332
addTrackedFile(filePath: string, isThirdPartyImport = false, isInPyTypedPackage = false): SourceFile {
333333
let sourceFileInfo = this.getSourceFileInfo(filePath);
334-
const importName = this._getImportNameForFile(filePath);
334+
let importName = this._getImportNameForFile(filePath);
335+
// HACK(scip-python): When adding tracked files for imports, we end up passing
336+
// normalized paths as the argument. However, _getImportNameForFile seemingly
337+
// needs a non-normalized path, which cannot be recovered directly from a
338+
// normalized path. However, in practice, the non-normalized path seems to
339+
// be stored on the sourceFileInfo, so attempt to use that instead.
340+
if (importName === '' && sourceFileInfo) {
341+
importName = this._getImportNameForFile(sourceFileInfo.sourceFile.getFilePath());
342+
}
335343

336344
if (sourceFileInfo) {
337345
// The module name may have changed based on updates to the

packages/pyright-scip/CONTRIBUTING.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,32 @@ node ./index.js <other args>
7373
npm run check-snapshots
7474
```
7575

76+
#### Filter specific snapshot tests
77+
78+
Use the `--filter-tests` flag to run only specific snapshot tests:
79+
```bash
80+
# Using npm scripts (note the -- to pass arguments)
81+
npm run check-snapshots -- --filter-tests test1,test2,test3
82+
```
83+
84+
Available snapshot tests can be found in `snapshots/input/`.
85+
7686
Using a different Python version other than the one specified
7787
in `.tool-versions` may also lead to errors.
7888

89+
## Making changes to Pyright internals
90+
91+
When modifying code in the `pyright-internal` package:
92+
93+
1. Keep changes minimal: Every change introduces a risk of
94+
merge conflicts. Adding doc comments is fine, but avoid
95+
changing functionality if possible. Instead of changing
96+
access modifiers, prefer copying small functions into
97+
scip-pyright logic.
98+
2. Use a `NOTE(scip-python):` prefix when adding comments to
99+
make it clearer which comments were added by upstream
100+
maintainers vs us.
101+
79102
## Publishing releases
80103

81104
1. Change the version in `packages/pyright-scip/package.json`
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# < definition scip-python python snapshot-util 0.1 `src.long_importer`/__init__:
22

33
import foo.bar.baz.mod
4-
# ^^^^^^^^^^^^^^^ reference snapshot-util 0.1 `foo.bar.baz.mod`/__init__:
4+
# ^^^^^^^^^^^^^^^ reference local 0
55

66
print(foo.bar.baz.mod.SuchNestedMuchWow)
77
#^^^^ reference python-stdlib 3.11 builtins/print().
8-
# ^^^^^^^^^^^^^^^ reference snapshot-util 0.1 `foo.bar.baz.mod`/__init__:
8+
# ^^^ reference local 0
99
# ^^^^^^^^^^^^^^^^^ reference snapshot-util 0.1 `src.foo.bar.baz.mod`/SuchNestedMuchWow#
1010

packages/pyright-scip/src/indexer.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ export class Indexer {
123123
this.importResolver = new ImportResolver(fs, this.pyrightConfig, host);
124124

125125
this.program = new Program(this.importResolver, this.pyrightConfig);
126-
// Normalize paths to ensure consistency with other code paths.
127-
const normalizedProjectFiles = [...this.projectFiles].map((path: string) => normalizePathCase(fs, path));
128-
this.program.setTrackedFiles(normalizedProjectFiles);
126+
// setTrackedFiles internally handles path normalization, so we don't normalize
127+
// paths here.
128+
this.program.setTrackedFiles([...this.projectFiles]);
129129

130130
if (scipConfig.projectNamespace) {
131131
setProjectNamespace(scipConfig.projectName, this.scipConfig.projectNamespace!);
@@ -194,7 +194,9 @@ export class Indexer {
194194
let projectSourceFiles: SourceFile[] = [];
195195
withStatus('Index workspace and track project files', () => {
196196
this.program.indexWorkspace((filepath: string) => {
197-
// Filter out filepaths not part of this project
197+
// Do not index files outside the project because SCIP doesn't support it.
198+
//
199+
// Both filepath and this.scipConfig.projectRoot are NOT normalized.
198200
if (filepath.indexOf(this.scipConfig.projectRoot) != 0) {
199201
return;
200202
}
@@ -204,6 +206,7 @@ export class Indexer {
204206

205207
let requestsImport = sourceFile.getImports();
206208
requestsImport.forEach((entry) =>
209+
// entry.resolvedPaths are all normalized.
207210
entry.resolvedPaths.forEach((value) => {
208211
this.program.addTrackedFile(value, true, false);
209212
})

packages/pyright-scip/src/lib.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ export function writeSnapshot(outputPath: string, obtained: string): void {
310310
fs.writeFileSync(outputPath, obtained, { flag: 'w' });
311311
}
312312

313-
export function diffSnapshot(outputPath: string, obtained: string): void {
313+
export function diffSnapshot(outputPath: string, obtained: string): 'equal' | 'different' {
314314
let existing = fs.readFileSync(outputPath, { encoding: 'utf8' });
315315
if (obtained === existing) {
316-
return;
316+
return 'equal';
317317
}
318318

319319
console.error(
@@ -326,7 +326,7 @@ export function diffSnapshot(outputPath: string, obtained: string): void {
326326
'(what the current code produces). Run the command "npm run update-snapshots" to accept the new behavior.'
327327
)
328328
);
329-
exit(1);
329+
return 'different';
330330
}
331331

332332
function occurrencesByLine(a: scip.Occurrence, b: scip.Occurrence): number {

packages/pyright-scip/src/main-impl.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import { IndexOptions, SnapshotOptions, mainCommand } from './MainCommand';
99
import { sendStatus, setQuiet, setShowProgressRateLimit } from './status';
1010
import { Indexer } from './indexer';
1111
import { exit } from 'process';
12+
import { TestFailure, TestError, ValidationResults } from './test-runner';
1213

13-
function indexAction(options: IndexOptions): void {
14+
export function indexAction(options: IndexOptions): void {
1415
setQuiet(options.quiet);
1516
if (options.showProgressRateLimit !== undefined) {
1617
setShowProgressRateLimit(options.showProgressRateLimit);
@@ -65,6 +66,7 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void {
6566
const outputDirectory = path.resolve(join(snapshotRoot, 'output'));
6667

6768
let snapshotDirectories = fs.readdirSync(inputDirectory);
69+
6870
if (subdir) {
6971
console.assert(snapshotDirectories.find((val) => val === subdir) !== undefined);
7072
snapshotDirectories = [subdir];
@@ -91,6 +93,8 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void {
9193

9294
const scipIndexPath = path.join(projectRoot, options.output);
9395
const scipIndex = scip.Index.deserializeBinary(fs.readFileSync(scipIndexPath));
96+
97+
let hasDiff = false;
9498
for (const doc of scipIndex.documents) {
9599
if (doc.relative_path.startsWith('..')) {
96100
continue;
@@ -103,11 +107,15 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void {
103107
const outputPath = path.resolve(outputDirectory, snapshotDir, relativeToInputDirectory);
104108

105109
if (options.check) {
106-
diffSnapshot(outputPath, obtained);
110+
const diffResult = diffSnapshot(outputPath, obtained);
111+
hasDiff = hasDiff || diffResult === 'different';
107112
} else {
108113
writeSnapshot(outputPath, obtained);
109114
}
110115
}
116+
if (hasDiff) {
117+
exit(1);
118+
}
111119
}
112120
}
113121

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
import * as fs from 'fs';
2+
import * as path from 'path';
3+
import { join } from 'path';
4+
5+
export interface TestFailure {
6+
testName: string;
7+
type: 'empty-scip-index' | 'missing-output' | 'content-mismatch' | 'orphaned-output';
8+
message: string;
9+
}
10+
11+
export interface TestError {
12+
testName: string;
13+
type: 'invalid-filter' | 'empty-scip-index';
14+
message: string;
15+
}
16+
17+
export interface ValidationResults {
18+
passed: string[];
19+
failed: TestFailure[];
20+
errors: TestError[];
21+
skipped: string[];
22+
}
23+
24+
export interface TestRunnerOptions {
25+
snapshotRoot: string;
26+
filterTests?: string;
27+
failFast?: boolean;
28+
quiet?: boolean;
29+
}
30+
31+
export interface SingleTestOptions {
32+
check: boolean;
33+
quiet: boolean;
34+
}
35+
36+
function validateFilterTestNames(inputDirectory: string, filterTestNames: string[]): TestError[] {
37+
const availableTests = fs.readdirSync(inputDirectory);
38+
const missingTests = filterTestNames.filter(name => !availableTests.includes(name));
39+
40+
if (missingTests.length > 0) {
41+
return [{
42+
testName: missingTests.join(', '),
43+
type: 'invalid-filter',
44+
message: `The following test names were not found: ${missingTests.join(', ')}. Available tests: ${availableTests.join(', ')}`
45+
}];
46+
}
47+
48+
return [];
49+
}
50+
51+
function detectOrphanedOutputs(inputDirectory: string, outputDirectory: string): TestFailure[] {
52+
if (!fs.existsSync(outputDirectory)) {
53+
return [];
54+
}
55+
56+
const inputTests = new Set(fs.readdirSync(inputDirectory));
57+
const outputTests = fs.readdirSync(outputDirectory);
58+
const orphanedOutputs: TestFailure[] = [];
59+
60+
for (const outputTest of outputTests) {
61+
if (!inputTests.has(outputTest)) {
62+
orphanedOutputs.push({
63+
testName: outputTest,
64+
type: 'orphaned-output',
65+
message: `Output folder exists but no corresponding input folder found`
66+
});
67+
}
68+
}
69+
70+
return orphanedOutputs;
71+
}
72+
73+
function reportResults(results: ValidationResults): void {
74+
const totalTests = results.passed.length + results.errors.length + results.failed.length + results.skipped.length;
75+
console.assert(totalTests > 0, 'No tests found');
76+
const errorCount = results.errors.length;
77+
78+
for (const error of results.errors) {
79+
console.error(`ERROR [${error.testName}]: ${error.message}`);
80+
}
81+
82+
for (const failure of results.failed) {
83+
console.error(`FAIL [${failure.testName}]: ${failure.message}`);
84+
}
85+
86+
let summaryStr = `\n${results.passed.length}/${totalTests} tests passed, ${results.failed.length} failed, ${errorCount} errored`;
87+
if (results.skipped.length > 0) {
88+
summaryStr += `, ${results.skipped.length} skipped`;
89+
}
90+
console.log(summaryStr);
91+
}
92+
93+
export class TestRunner {
94+
constructor(private options: TestRunnerOptions) {}
95+
96+
runTests(
97+
runSingleTest: (testName: string, inputDir: string, outputDir: string) => ValidationResults
98+
): void {
99+
const inputDirectory = path.resolve(join(this.options.snapshotRoot, 'input'));
100+
const outputDirectory = path.resolve(join(this.options.snapshotRoot, 'output'));
101+
const failFast = this.options.failFast ?? false;
102+
103+
const results: ValidationResults = {
104+
passed: [],
105+
failed: [],
106+
errors: [],
107+
skipped: []
108+
};
109+
110+
// Pre-execution validation: determine test directories to process
111+
let snapshotDirectories = fs.readdirSync(inputDirectory);
112+
let isFilterMode = false;
113+
114+
if (this.options.filterTests) {
115+
// Filter to specific tests
116+
const filterTestNames = this.options.filterTests.split(',').map(name => name.trim());
117+
isFilterMode = true;
118+
119+
// Validate filter test names exist
120+
const filterErrors = validateFilterTestNames(inputDirectory, filterTestNames);
121+
if (filterErrors.length > 0) {
122+
results.errors.push(...filterErrors);
123+
reportResults(results);
124+
return;
125+
}
126+
127+
snapshotDirectories = snapshotDirectories.filter(dir => filterTestNames.includes(dir));
128+
}
129+
130+
// In non-filtering mode, detect orphaned outputs that should be cleaned up
131+
if (!isFilterMode) {
132+
const orphanedOutputs = detectOrphanedOutputs(inputDirectory, outputDirectory);
133+
134+
// For orphaned outputs in check mode, report as failures
135+
if (orphanedOutputs.length > 0) {
136+
results.failed.push(...orphanedOutputs);
137+
138+
if (failFast) {
139+
reportResults(results);
140+
return;
141+
}
142+
}
143+
}
144+
145+
for (let i = 0; i < snapshotDirectories.length; i++) {
146+
const testName = snapshotDirectories[i];
147+
if (!this.options.quiet) {
148+
console.log(`Processing test: ${testName}`);
149+
}
150+
151+
try {
152+
const testResults = runSingleTest(
153+
testName,
154+
inputDirectory,
155+
outputDirectory,
156+
);
157+
158+
// Merge results
159+
results.passed.push(...testResults.passed);
160+
results.failed.push(...testResults.failed);
161+
results.errors.push(...testResults.errors);
162+
163+
// Check for fail-fast condition
164+
if (failFast && (testResults.failed.length > 0 || testResults.errors.length > 0)) {
165+
// Track remaining tests as skipped
166+
for (let j = i + 1; j < snapshotDirectories.length; j++) {
167+
results.skipped.push(snapshotDirectories[j]);
168+
}
169+
reportResults(results);
170+
return;
171+
}
172+
} catch (error) {
173+
results.errors.push({
174+
testName,
175+
type: 'empty-scip-index',
176+
message: `Test runner failed: ${error}`
177+
});
178+
179+
if (failFast) {
180+
for (let j = i + 1; j < snapshotDirectories.length; j++) {
181+
results.skipped.push(snapshotDirectories[j]);
182+
}
183+
reportResults(results);
184+
return;
185+
}
186+
}
187+
}
188+
189+
reportResults(results);
190+
}
191+
}

0 commit comments

Comments
 (0)