fix: CI 테스트 14건 실패 수정 — surrogate/mock/assertion 오류 해결

- Notion exporter: requests 미설치 환경에서 sys.modules mock 방식으로 변경
- indexer/stats: UTF-16 surrogate pair를 정상 Unicode(\U0001f4c1)로 교체
- git_info: _get_branch 직접 patch로 예외 전파 테스트 수정

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: solzip

tests/test_exporters.py

@@ -295,72 +295,76 @@ def test_validate_config_empty(self):
         from claude_diary.exporters.notion import NotionExporter
         assert not NotionExporter({}).validate_config()
 
-    @patch("requests.post")
-    def test_export_success(self, mock_post):
+    def test_export_success(self):
         from claude_diary.exporters.notion import NotionExporter
+        mock_requests = MagicMock()
         mock_resp = MagicMock()
         mock_resp.status_code = 200
-        mock_post.return_value = mock_resp
-
-        exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
-        result = exp.export(SAMPLE_ENTRY)
-        assert result is True
-        mock_post.assert_called_once()
-
-        # Verify the API call — requests.post(url, headers=..., json=..., timeout=...)
-        call_kwargs = mock_post.call_args
-        assert call_kwargs[0][0] == "https://api.notion.com/v1/pages"
-        headers = call_kwargs[1]["headers"]
-        assert headers["Authorization"] == "Bearer secret_abc"
-        assert headers["Notion-Version"] == "2022-06-28"
-
-    @patch("requests.post")
-    def test_export_failure_status(self, mock_post):
+        mock_requests.post.return_value = mock_resp
+
+        with patch.dict("sys.modules", {"requests": mock_requests}):
+            exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
+            result = exp.export(SAMPLE_ENTRY)
+            assert result is True
+            mock_requests.post.assert_called_once()
+
+            # Verify the API call — requests.post(url, headers=..., json=..., timeout=...)
+            call_kwargs = mock_requests.post.call_args
+            assert call_kwargs[0][0] == "https://api.notion.com/v1/pages"
+            headers = call_kwargs[1]["headers"]
+            assert headers["Authorization"] == "Bearer secret_abc"
+            assert headers["Notion-Version"] == "2022-06-28"
+
+    def test_export_failure_status(self):
         from claude_diary.exporters.notion import NotionExporter
+        mock_requests = MagicMock()
         mock_resp = MagicMock()
         mock_resp.status_code = 400
-        mock_post.return_value = mock_resp
+        mock_requests.post.return_value = mock_resp
 
-        exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
-        result = exp.export(SAMPLE_ENTRY)
-        assert result is False
+        with patch.dict("sys.modules", {"requests": mock_requests}):
+            exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
+            result = exp.export(SAMPLE_ENTRY)
+            assert result is False
 
-    @patch("requests.post")
-    def test_export_with_team_member(self, mock_post):
+    def test_export_with_team_member(self):
         """Team mode: Author field should be included in properties."""
         from claude_diary.exporters.notion import NotionExporter
+        mock_requests = MagicMock()
         mock_resp = MagicMock()
         mock_resp.status_code = 200
-        mock_post.return_value = mock_resp
-
-        exp = NotionExporter({
-            "api_token": "secret_abc",
-            "database_id": "db123",
-            "member_name": "alice",
-        })
-        exp.export(SAMPLE_ENTRY)
-
-        call_kwargs = mock_post.call_args
-        properties = call_kwargs[1]["json"]["properties"]
-        assert "Author" in properties
-        assert properties["Author"]["select"]["name"] == "alice"
-
-    @patch("requests.post")
-    def test_export_properties_structure(self, mock_post):
+        mock_requests.post.return_value = mock_resp
+
+        with patch.dict("sys.modules", {"requests": mock_requests}):
+            exp = NotionExporter({
+                "api_token": "secret_abc",
+                "database_id": "db123",
+                "member_name": "alice",
+            })
+            exp.export(SAMPLE_ENTRY)
+
+            call_kwargs = mock_requests.post.call_args
+            properties = call_kwargs[1]["json"]["properties"]
+            assert "Author" in properties
+            assert properties["Author"]["select"]["name"] == "alice"
+
+    def test_export_properties_structure(self):
         """Verify properties include git commits and code stats when present."""
         from claude_diary.exporters.notion import NotionExporter
+        mock_requests = MagicMock()
         mock_resp = MagicMock()
         mock_resp.status_code = 200
-        mock_post.return_value = mock_resp
+        mock_requests.post.return_value = mock_resp
 
-        exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
-        exp.export(RICH_ENTRY)
+        with patch.dict("sys.modules", {"requests": mock_requests}):
+            exp = NotionExporter({"api_token": "secret_abc", "database_id": "db123"})
+            exp.export(RICH_ENTRY)
 
-        call_kwargs = mock_post.call_args
-        properties = call_kwargs[1]["json"]["properties"]
-        assert "Git Commits" in properties
-        assert "Lines Changed" in properties
-        assert properties["Lines Changed"]["number"] == 60  # 50 added + 10 deleted
+            call_kwargs = mock_requests.post.call_args
+            properties = call_kwargs[1]["json"]["properties"]
+            assert "Git Commits" in properties
+            assert "Lines Changed" in properties
+            assert properties["Lines Changed"]["number"] == 60  # 50 added + 10 deleted
 
     def test_export_requests_not_installed(self):
         """When requests is not installed, export should return False."""

tests/test_git_info.py

@@ -196,12 +196,8 @@ def fake_run(cmd, **kwargs):
             assert result["diff_stat"]["added"] == 3
 
     def test_returns_none_on_exception(self):
-        def fake_run(cmd, **kwargs):
-            if "rev-parse" in cmd:
-                return MagicMock(returncode=0)
-            raise RuntimeError("unexpected error")
-
-        with patch("claude_diary.lib.git_info.subprocess.run", side_effect=fake_run):
+        with patch("claude_diary.lib.git_info._is_git_repo", return_value=True), \
+             patch("claude_diary.lib.git_info._get_branch", side_effect=RuntimeError("unexpected error")):
             result = collect_git_info("/repo")
             assert result is None
 

tests/test_indexer.py

@@ -208,14 +208,14 @@ def test_reindex_with_sessions(self, tmp_path):
         content = (
             "# 2026-03-17\n\n"
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `my-project`\n\n"
+            "\U0001f4c1 `my-project`\n\n"
             "\uce74\ud14c\uace0\ub9ac: `feature`\n\n"
             "\uc791\uc5c5 \uc694\uccad:\n"
             "  1. Build authentication module\n"
             "  2. Write tests for login\n\n"
             "  - `src/auth.py`\n\n"
             "### \u23f0 14:00:00\n"
-            "\ud83d\udcc1 `other-project`\n"
+            "\U0001f4c1 `other-project`\n"
         )
         (tmp_path / "2026-03-17.md").write_text(content, encoding="utf-8")
 
@@ -236,11 +236,11 @@ def test_reindex_skips_zero_session_files(self, tmp_path):
     def test_reindex_multiple_files(self, tmp_path):
         day1 = (
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `proj-a`\n"
+            "\U0001f4c1 `proj-a`\n"
         )
         day2 = (
             "### \u23f0 09:00:00\n"
-            "\ud83d\udcc1 `proj-b`\n"
+            "\U0001f4c1 `proj-b`\n"
         )
         (tmp_path / "2026-03-16.md").write_text(day1, encoding="utf-8")
         (tmp_path / "2026-03-17.md").write_text(day2, encoding="utf-8")
@@ -255,7 +255,7 @@ def test_reindex_multiple_files(self, tmp_path):
     def test_reindex_extracts_keywords_from_task_requests(self, tmp_path):
         content = (
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `proj`\n\n"
+            "\U0001f4c1 `proj`\n\n"
             "\uc791\uc5c5 \uc694\uccad:\n"
             "  1. Implement authentication flow\n"
         )
@@ -267,7 +267,7 @@ def test_reindex_extracts_keywords_from_task_requests(self, tmp_path):
 
     def test_reindex_handles_unreadable_file(self, tmp_path):
         """A file that parse_daily_file can read but read_text fails for."""
-        content = "### \u23f0 10:00:00\n\ud83d\udcc1 `proj`\n"
+        content = "### \u23f0 10:00:00\n\U0001f4c1 `proj`\n"
         f = tmp_path / "2026-03-17.md"
         f.write_text(content, encoding="utf-8")
 
@@ -288,7 +288,7 @@ def mock_read_text(self, *args, **kwargs):
     def test_reindex_session_without_time(self, tmp_path):
         content = (
             "### \u23f0\n"
-            "\ud83d\udcc1 `proj`\n"
+            "\U0001f4c1 `proj`\n"
         )
         (tmp_path / "2026-03-17.md").write_text(content, encoding="utf-8")
         count = reindex_all(str(tmp_path))
@@ -305,7 +305,7 @@ def test_reindex_session_without_project(self, tmp_path):
         assert index["entries"][0]["project"] == ""
 
     def test_reindex_sets_last_indexed(self, tmp_path):
-        content = "### \u23f0 10:00:00\n\ud83d\udcc1 `proj`\n"
+        content = "### \u23f0 10:00:00\n\U0001f4c1 `proj`\n"
         (tmp_path / "2026-03-17.md").write_text(content, encoding="utf-8")
         reindex_all(str(tmp_path))
         index = load_index(str(tmp_path))

tests/test_stats.py

@@ -52,9 +52,9 @@ class TestParseDailyFileProjects:
     def test_extracts_projects(self, tmp_path):
         content = (
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `my-project`\n"
+            "\U0001f4c1 `my-project`\n"
             "### \u23f0 14:00:00\n"
-            "\ud83d\udcc1 `other-project`\n"
+            "\U0001f4c1 `other-project`\n"
         )
         f = tmp_path / "2026-03-17.md"
         f.write_text(content, encoding="utf-8")
@@ -64,9 +64,9 @@ def test_extracts_projects(self, tmp_path):
     def test_duplicate_projects(self, tmp_path):
         content = (
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `my-project`\n"
+            "\U0001f4c1 `my-project`\n"
             "### \u23f0 14:00:00\n"
-            "\ud83d\udcc1 `my-project`\n"
+            "\U0001f4c1 `my-project`\n"
         )
         f = tmp_path / "2026-03-17.md"
         f.write_text(content, encoding="utf-8")
@@ -225,9 +225,9 @@ def test_extracts_task_requests_english(self, tmp_path):
 class TestParseDailyFileFullDocument:
     def test_full_diary_entry(self, tmp_path):
         content = (
-            "# \ud83d\udcdd 2026-03-17\n\n"
+            "# \U0001f4dd 2026-03-17\n\n"
             "### \u23f0 10:00:00\n"
-            "\ud83d\udcc1 `my-app`\n\n"
+            "\U0001f4c1 `my-app`\n\n"
             "\uce74\ud14c\uace0\ub9ac: `feature`\n\n"
             "\uc0dd\uc131\ub41c \ud30c\uc77c:\n"
             "  - `src/new.py`\n\n"
@@ -240,7 +240,7 @@ def test_full_diary_entry(self, tmp_path):
             "\uc791\uc5c5 \uc694\uccad:\n"
             "  1. Build the feature\n\n"
             "### \u23f0 14:00:00\n"
-            "\ud83d\udcc1 `other-app`\n"
+            "\U0001f4c1 `other-app`\n"
         )
         f = tmp_path / "2026-03-17.md"
         f.write_text(content, encoding="utf-8")