From b0b1be0c2a0641bf8c78098869c570df2a6f2d3c Mon Sep 17 00:00:00 2001
From: Gal Zahavi <38544478+galz10@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:05:11 -0700
Subject: [PATCH] chore(int): skip flaky tests (#10736)

---
 integration-tests/mcp_server_cyclic_schema.test.ts      | 3 ++-
 integration-tests/run_shell_command.test.ts             | 3 ++-
 integration-tests/simple-mcp-server.test.ts             | 3 ++-
 packages/cli/src/config/extension.test.ts               | 3 ++-
 packages/cli/src/ui/commands/setupGithubCommand.test.ts | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/integration-tests/mcp_server_cyclic_schema.test.ts b/integration-tests/mcp_server_cyclic_schema.test.ts
index c1ed12ce3e..8ff6d8ce96 100644
--- a/integration-tests/mcp_server_cyclic_schema.test.ts
+++ b/integration-tests/mcp_server_cyclic_schema.test.ts
@@ -192,7 +192,8 @@ describe('mcp server with cyclic tool schema is detected', () => {
     }
   });
 
-  it('mcp tool list should include tool with cyclic tool schema', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10735
+  it.skip('mcp tool list should include tool with cyclic tool schema', async () => {
     const tool_list_output = await rig.run('/mcp list');
     expect(tool_list_output).toContain('tool_with_cyclic_schema');
   });
diff --git a/integration-tests/run_shell_command.test.ts b/integration-tests/run_shell_command.test.ts
index f839a45104..480baaccdc 100644
--- a/integration-tests/run_shell_command.test.ts
+++ b/integration-tests/run_shell_command.test.ts
@@ -197,7 +197,8 @@ describe('run_shell_command', () => {
     ).toBeTruthy();
   });
 
-  it('should combine multiple --allowed-tools flags', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10737
+  it.skip('should combine multiple --allowed-tools flags', async () => {
     const rig = new TestRig();
     await rig.setup('should combine multiple --allowed-tools flags');
 
diff --git a/integration-tests/simple-mcp-server.test.ts b/integration-tests/simple-mcp-server.test.ts
index d8b6268d01..f5dd806cd2 100644
--- a/integration-tests/simple-mcp-server.test.ts
+++ b/integration-tests/simple-mcp-server.test.ts
@@ -210,7 +210,8 @@ describe('simple-mcp-server', () => {
     }
   });
 
-  it('should add two numbers', async () => {
+  //TODO -https://github.com/google-gemini/gemini-cli/issues/10738
+  it.skip('should add two numbers', async () => {
     // Test directory is already set up in before hook
     // Just run the command - MCP server config is in settings.json
     const output = await rig.run('add 5 and 10');
diff --git a/packages/cli/src/config/extension.test.ts b/packages/cli/src/config/extension.test.ts
index c4f8061a3e..3a0d4668f6 100644
--- a/packages/cli/src/config/extension.test.ts
+++ b/packages/cli/src/config/extension.test.ts
@@ -880,7 +880,8 @@ describe('extension tests', () => {
       expect(mockLogExtensionInstallEvent).toHaveBeenCalled();
     });
 
-    it('should show users information on their mcp server when installing', async () => {
+    //TODO - https://github.com/google-gemini/gemini-cli/issues/10739
+    it.skip('should show users information on their mcp server when installing', async () => {
       const consoleInfoSpy = vi.spyOn(console, 'info');
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
diff --git a/packages/cli/src/ui/commands/setupGithubCommand.test.ts b/packages/cli/src/ui/commands/setupGithubCommand.test.ts
index bac0207045..c61392b37e 100644
--- a/packages/cli/src/ui/commands/setupGithubCommand.test.ts
+++ b/packages/cli/src/ui/commands/setupGithubCommand.test.ts
@@ -49,7 +49,8 @@ describe('setupGithubCommand', async () => {
     if (scratchDir) await fs.rm(scratchDir, { recursive: true });
   });
 
-  it('returns a tool action to download github workflows and handles paths', async () => {
+  //TODO - https://github.com/google-gemini/gemini-cli/issues/10740
+  it.skip('returns a tool action to download github workflows and handles paths', async () => {
     const fakeRepoOwner = 'fake';
     const fakeRepoName = 'repo';
     const fakeRepoRoot = scratchDir;