[feature][for merge][part2] Support terminal-bench-2#320
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a comprehensive suite of unit tests for HarborTask in test_harbor_task.py. However, there are unresolved git conflict markers in mini_swe_agent_swe_bench_multilingual_mini.py that must be cleaned up before merging. Additionally, the unit tests should be improved by using @mock.patch.dict(os.environ) instead of manually modifying os.environ to ensure proper isolation and prevent state leakage between tests.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| <<<<<<< HEAD | ||
| path="", # necessary for mini datasets, get dataset from https://modelers.cn/datasets/AISBench/SWE-Bench_Multilingual_mini | ||
| ======= | ||
| path="", # Set local path to the mini dataset. Download from https://modelers.cn/datasets/AISBench/SWE-Bench_Multilingual_mini | ||
| >>>>>>> master_center |
There was a problem hiding this comment.
There are unresolved git conflict markers in this file. Please resolve the conflict and remove the markers before merging.
path="", # Set local path to the mini dataset. Download from https://modelers.cn/datasets/AISBench/SWE-Bench_Multilingual_miniReferences
- Code should not contain unresolved git conflict markers as it prevents compilation/execution and indicates an incomplete merge.
| def test_set_api_key_with_api_key(self): | ||
| original_env = os.environ.get("OPENAI_API_KEY") | ||
| cfg = ConfigDict({ | ||
| "work_dir": self.temp_dir, | ||
| "models": [{"abbr": "test_model", "api_key": "test_key"}], | ||
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | ||
| "cli_args": {"debug": False} | ||
| }) | ||
| task = HarborTask(cfg) | ||
| task._set_api_key() | ||
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), "test_key") | ||
| if original_env: | ||
| os.environ["OPENAI_API_KEY"] = original_env | ||
| else: | ||
| os.environ.pop("OPENAI_API_KEY", None) |
There was a problem hiding this comment.
Modifying os.environ directly inside a test without proper cleanup can leak state to other tests if an assertion fails or an exception is raised. Use @mock.patch.dict(os.environ) to ensure the environment is safely restored after the test runs.
| def test_set_api_key_with_api_key(self): | |
| original_env = os.environ.get("OPENAI_API_KEY") | |
| cfg = ConfigDict({ | |
| "work_dir": self.temp_dir, | |
| "models": [{"abbr": "test_model", "api_key": "test_key"}], | |
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | |
| "cli_args": {"debug": False} | |
| }) | |
| task = HarborTask(cfg) | |
| task._set_api_key() | |
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), "test_key") | |
| if original_env: | |
| os.environ["OPENAI_API_KEY"] = original_env | |
| else: | |
| os.environ.pop("OPENAI_API_KEY", None) | |
| @mock.patch.dict(os.environ) | |
| def test_set_api_key_with_api_key(self): | |
| cfg = ConfigDict({ | |
| "work_dir": self.temp_dir, | |
| "models": [{"abbr": "test_model", "api_key": "test_key"}], | |
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | |
| "cli_args": {"debug": False} | |
| }) | |
| task = HarborTask(cfg) | |
| task._set_api_key() | |
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), "test_key") |
References
- Tests should be isolated and not pollute the global state (such as environment variables) to prevent flaky tests and side effects on other tests.
| def test_set_api_key_without_api_key(self): | ||
| original_env = os.environ.get("OPENAI_API_KEY") | ||
| cfg = ConfigDict({ | ||
| "work_dir": self.temp_dir, | ||
| "models": [{"abbr": "test_model"}], | ||
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | ||
| "cli_args": {"debug": False} | ||
| }) | ||
| task = HarborTask(cfg) | ||
| task._set_api_key() | ||
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), DEFAULT_FAKE_API_KEY) | ||
| if original_env: | ||
| os.environ["OPENAI_API_KEY"] = original_env | ||
| else: | ||
| os.environ.pop("OPENAI_API_KEY", None) |
There was a problem hiding this comment.
Modifying os.environ directly inside a test without proper cleanup can leak state to other tests if an assertion fails or an exception is raised. Use @mock.patch.dict(os.environ) to ensure the environment is safely restored after the test runs.
| def test_set_api_key_without_api_key(self): | |
| original_env = os.environ.get("OPENAI_API_KEY") | |
| cfg = ConfigDict({ | |
| "work_dir": self.temp_dir, | |
| "models": [{"abbr": "test_model"}], | |
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | |
| "cli_args": {"debug": False} | |
| }) | |
| task = HarborTask(cfg) | |
| task._set_api_key() | |
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), DEFAULT_FAKE_API_KEY) | |
| if original_env: | |
| os.environ["OPENAI_API_KEY"] = original_env | |
| else: | |
| os.environ.pop("OPENAI_API_KEY", None) | |
| @mock.patch.dict(os.environ) | |
| def test_set_api_key_without_api_key(self): | |
| cfg = ConfigDict({ | |
| "work_dir": self.temp_dir, | |
| "models": [{"abbr": "test_model"}], | |
| "datasets": [[{"abbr": "test_dataset", "args": {}}]], | |
| "cli_args": {"debug": False} | |
| }) | |
| task = HarborTask(cfg) | |
| task._set_api_key() | |
| self.assertEqual(os.environ.get("OPENAI_API_KEY"), DEFAULT_FAKE_API_KEY) |
References
- Tests should be isolated and not pollute the global state (such as environment variables) to prevent flaky tests and side effects on other tests.
| if original_env: | ||
| os.environ["OPENAI_API_KEY"] = original_env | ||
| else: | ||
| os.environ.pop("OPENAI_API_KEY", None) |
There was a problem hiding this comment.
[review] Modifying os.environ directly inside a test without proper cleanup can leak state to other tests if an assertion fails or an exception is raised. Use @mock.patch.dict(os.environ) to ensure the environment is safely restored after the test runs.
2 participants
Thanks for your contribution; we appreciate it a lot. The following instructions will make your pull request healthier and help you get feedback more easily. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.
感谢您的贡献，我们非常重视。以下说明将使您的拉取请求更健康，更易于获得反馈。如果您不理解某些项目，请不要担心，只需提交拉取请求并从维护人员那里寻求帮助即可。
PR Type / PR类型
Related Issue | 关联 Issue
Fixes #(issue ID / issue 编号) / Relates to #(issue ID / issue 编号)
🔍 Motivation / 变更动机
Please describe the motivation of this PR and the goal you want to achieve through this PR.
请描述您的拉取请求的动机和您希望通过此拉取请求实现的目标。
#314
📝 Modification / 修改内容
Please briefly describe what modification is made in this PR.
请简要描述此拉取请求中进行的修改。
📐 Associated Test Results / 关联测试结果
Please provide links to the related test results, such as CI pipelines, test reports, etc.
请提供相关测试结果的链接，例如 CI 管道、测试报告等。
Does the modification introduce changes that break the backward compatibility of the downstream repositories? If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.
是否引入了会破坏下游存储库向后兼容性的更改？如果是，请描述它如何破坏兼容性，以及下游项目应该如何修改其代码以保持与此 PR 的兼容性。
If the modification introduces performance degradation, please describe the impact of the performance degradation and the expected performance improvement.
如果引入了性能下降，请描述性能下降的影响和预期的性能改进。
🌟 Use cases (Optional) / 使用案例（可选）
If this PR introduces a new feature, it is better to list some use cases here and update the documentation.
如果此拉取请求引入了新功能，最好在此处列出一些用例并更新文档。
✅ Checklist / 检查列表
Before PR:
After PR:
👥 Collaboration Info / 协作信息
🌟 Useful CI Command / 实用的CI命令
/gemini review/gemini summary/gemini help/readthedocs build