MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-28 14:04:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): improve test isolation and enable subagent evaluations (#18138)

Browse Source
This commit is contained in:
Coco Sheng
2026-02-03 14:05:26 -05:00
committed by GitHub
parent 4aa295994d
commit 3183e4137a
2 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/test-utils/src/test-rig.ts
+35 -16
View File
@@ -277,6 +277,7 @@ export class TestRig {
homeDir: string | null = null;
testName?: string;
_lastRunStdout?: string;
_lastRunStderr?: string;
// Path to the copied fake responses file for this test.
fakeResponsesPath?: string;
// Original fake responses file path for rewriting goldens in record mode.
@@ -396,6 +397,34 @@ export class TestRig {
return { command, initialArgs };
}
private _getCleanEnv(
extraEnv?: Record<string, string | undefined>,
): Record<string, string | undefined> {
const cleanEnv: Record<string, string | undefined> = { ...process.env };
// Clear all GEMINI_ environment variables that might interfere with tests
// except for those we explicitly want to keep or set.
for (const key of Object.keys(cleanEnv)) {
if (
(key.startsWith('GEMINI_') || key.startsWith('GOOGLE_GEMINI_')) &&
key !== 'GEMINI_API_KEY' &&
key !== 'GOOGLE_API_KEY' &&
key !== 'GEMINI_MODEL' &&
key !== 'GEMINI_DEBUG' &&
key !== 'GEMINI_CLI_TEST_VAR' &&
!key.startsWith('GEMINI_CLI_ACTIVITY_LOG')
) {
delete cleanEnv[key];
}
}
return {
...cleanEnv,
GEMINI_CLI_HOME: this.homeDir!,
...extraEnv,
};
}
run(options: {
args?: string | string[];
stdin?: string;
@@ -433,11 +462,7 @@ export class TestRig {
const child = spawn(command, commandArgs, {
cwd: this.testDir!,
stdio: 'pipe',
env: {
...process.env,
GEMINI_CLI_HOME: this.homeDir!,
...options.env,
},
env: this._getCleanEnv(options.env),
});
this._spawnedProcesses.push(child);
@@ -487,6 +512,7 @@ export class TestRig {
child.on('close', (code: number) => {
clearTimeout(timer);
this._lastRunStderr = stderr;
if (code === 0) {
// Store the raw stdout for Podman telemetry parsing
this._lastRunStdout = stdout;
@@ -573,7 +599,7 @@ export class TestRig {
const child = spawn(command, allArgs, {
cwd: this.testDir!,
stdio: 'pipe',
env: { ...process.env, GEMINI_CLI_HOME: this.homeDir! },
env: this._getCleanEnv(),
signal: options?.signal,
});
this._spawnedProcesses.push(child);
@@ -611,11 +637,7 @@ export class TestRig {
const child = spawn(command, commandArgs, {
cwd: this.testDir!,
stdio: 'pipe',
env: {
...process.env,
GEMINI_CLI_HOME: this.homeDir!,
...options.env,
},
env: this._getCleanEnv(options.env),
});
this._spawnedProcesses.push(child);
@@ -661,6 +683,7 @@ export class TestRig {
child.on('close', (code: number) => {
clearTimeout(timer);
this._lastRunStderr = stderr;
if (code === 0) {
this._lastRunStdout = stdout;
const result = this._filterPodmanTelemetry(stdout);
@@ -1179,11 +1202,7 @@ export class TestRig {
]);
const commandArgs = [...initialArgs];
const envVars = {
...process.env,
GEMINI_CLI_HOME: this.homeDir!,
...options?.env,
};
const envVars = this._getCleanEnv(options?.env);
const ptyOptions: pty.IPtyForkOptions = {
name: 'xterm-color',