test(detect_move): trim test file — remove comment blocks, inline args

Signed-off-by: mn-ram <[email protected]>

Author: mn-ram

tests/test_classes/test_detect_move.py

@@ -9,30 +9,29 @@
 )
 
 
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-def _make_response(status_code, headers=None, json_data=None, text=""):
+def _make_response(status_code, headers=None):
     resp = MagicMock()
     resp.status_code = status_code
     resp.headers = headers or {}
-    resp.text = text
-    resp.json = MagicMock(return_value=json_data or {})
+    resp.text = ""
+    resp.json = MagicMock(return_value={})
     return resp
 
 
-def _make_repo(repo_git="https://github.com/old-owner/old-repo", repo_id=1, description=""):
+def _make_repo(repo_git="https://github.com/old-owner/old-repo"):
     repo = MagicMock()
     repo.repo_git = repo_git
-    repo.repo_id = repo_id
-    repo.description = description
+    repo.repo_id = 1
+    repo.description = ""
     return repo
 
 
-# ---------------------------------------------------------------------------
-# ping_github_for_repo_move — 301 raises RepoMovedException with new_url
-# ---------------------------------------------------------------------------
+def _session_mock():
+    m = MagicMock()
+    m.__enter__ = MagicMock(return_value=MagicMock())
+    m.__exit__ = MagicMock(return_value=False)
+    return m
+
 
 @patch("augur.tasks.github.detect_move.core.update_repo_with_dict")
 @patch("augur.tasks.github.detect_move.core.extract_owner_and_repo_from_endpoint")
@@ -44,75 +43,41 @@ def test_ping_301_raises_repo_moved_exception(mock_hit, mock_extract, mock_updat
     mock_extract.return_value = ("new-owner", "new-repo")
     mock_update.return_value = "https://github.com/new-owner/new-repo"
 
-    session = MagicMock()
-    key_auth = MagicMock()
-    logger = MagicMock()
-    repo = _make_repo()
-
     with pytest.raises(RepoMovedException) as exc_info:
-        ping_github_for_repo_move(session, key_auth, repo, logger)
+        ping_github_for_repo_move(MagicMock(), MagicMock(), _make_repo(), MagicMock())
 
     assert exc_info.value.new_url == "https://github.com/new-owner/new-repo"
 
 
-# ---------------------------------------------------------------------------
-# ping_github_for_repo_move — 404 raises RepoGoneException
-# ---------------------------------------------------------------------------
-
 @patch("augur.tasks.github.detect_move.core.execute_session_query")
 @patch("augur.tasks.github.detect_move.core.update_repo_with_dict")
 @patch("augur.tasks.github.detect_move.core.hit_api")
 def test_ping_404_raises_repo_gone_exception(mock_hit, mock_update, mock_query):
     mock_hit.return_value = _make_response(404)
     mock_update.return_value = "https://github.com/old-owner/old-repo"
-
-    collection_record = MagicMock()
-    mock_query.return_value = collection_record
-
-    session = MagicMock()
-    key_auth = MagicMock()
-    logger = MagicMock()
-    repo = _make_repo()
+    mock_query.return_value = MagicMock()
 
     with pytest.raises(RepoGoneException):
-        ping_github_for_repo_move(session, key_auth, repo, logger)
-
+        ping_github_for_repo_move(MagicMock(), MagicMock(), _make_repo(), MagicMock())
 
-# ---------------------------------------------------------------------------
-# ping_github_for_repo_move — 200 returns normally
-# ---------------------------------------------------------------------------
 
 @patch("augur.tasks.github.detect_move.core.hit_api")
 def test_ping_200_returns_none(mock_hit):
     mock_hit.return_value = _make_response(200)
+    assert ping_github_for_repo_move(MagicMock(), MagicMock(), _make_repo(), MagicMock()) is None
 
-    session = MagicMock()
-    key_auth = MagicMock()
-    logger = MagicMock()
-    repo = _make_repo()
-
-    result = ping_github_for_repo_move(session, key_auth, repo, logger)
-    assert result is None
-
-
-# ---------------------------------------------------------------------------
-# detect_github_repo_move_core task — self.retry called with new URL on move
-# ---------------------------------------------------------------------------
 
 @patch("augur.tasks.github.detect_move.tasks.GithubRandomKeyAuth")
 @patch("augur.tasks.github.detect_move.tasks.get_session")
 @patch("augur.tasks.github.detect_move.tasks.get_repo_by_repo_git")
 @patch("augur.tasks.github.detect_move.tasks.ping_github_for_repo_move")
-def test_core_task_retries_with_new_url_on_move(
-    mock_ping, mock_get_repo, mock_get_session, mock_key_auth
-):
+def test_core_task_retries_with_new_url_on_move(mock_ping, mock_get_repo, mock_get_session, mock_key_auth):
     from augur.tasks.github.detect_move.tasks import detect_github_repo_move_core
 
     new_url = "https://github.com/new-owner/new-repo"
     mock_ping.side_effect = RepoMovedException("moved", new_url=new_url)
     mock_get_repo.return_value = _make_repo()
-    mock_get_session.return_value.__enter__ = MagicMock(return_value=MagicMock())
-    mock_get_session.return_value.__exit__ = MagicMock(return_value=False)
+    mock_get_session.return_value = _session_mock()
 
     task_self = MagicMock()
     task_self.retry = MagicMock(side_effect=Exception("retry_called"))
@@ -123,25 +88,16 @@ def test_core_task_retries_with_new_url_on_move(
     task_self.retry.assert_called_once_with(args=[new_url], countdown=0, max_retries=1)
 
 
-# ---------------------------------------------------------------------------
-# detect_github_repo_move_core task — Reject raised on RepoGoneException
-# ---------------------------------------------------------------------------
-
 @patch("augur.tasks.github.detect_move.tasks.GithubRandomKeyAuth")
 @patch("augur.tasks.github.detect_move.tasks.get_session")
 @patch("augur.tasks.github.detect_move.tasks.get_repo_by_repo_git")
 @patch("augur.tasks.github.detect_move.tasks.ping_github_for_repo_move")
-def test_core_task_rejects_on_repo_gone(
-    mock_ping, mock_get_repo, mock_get_session, mock_key_auth
-):
+def test_core_task_rejects_on_repo_gone(mock_ping, mock_get_repo, mock_get_session, mock_key_auth):
     from augur.tasks.github.detect_move.tasks import detect_github_repo_move_core
 
     mock_ping.side_effect = RepoGoneException("gone")
     mock_get_repo.return_value = _make_repo()
-    mock_get_session.return_value.__enter__ = MagicMock(return_value=MagicMock())
-    mock_get_session.return_value.__exit__ = MagicMock(return_value=False)
-
-    task_self = MagicMock()
+    mock_get_session.return_value = _session_mock()
 
     with pytest.raises(Reject):
-        detect_github_repo_move_core.__wrapped__(task_self, "https://github.com/old-owner/old-repo")
+        detect_github_repo_move_core.__wrapped__(MagicMock(), "https://github.com/old-owner/old-repo")