From 889acaec82bf0b7a6316d7e86e68748af7317438 Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 22 May 2018 20:54:00 -0400 Subject: [PATCH] [V3 Downloader] Fix #1671 (#1692) --- redbot/cogs/downloader/repo_manager.py | 4 ++-- tests/cogs/downloader/test_downloader.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/redbot/cogs/downloader/repo_manager.py b/redbot/cogs/downloader/repo_manager.py index bdd91a69c..a617778f5 100644 --- a/redbot/cogs/downloader/repo_manager.py +++ b/redbot/cogs/downloader/repo_manager.py @@ -537,8 +537,8 @@ class RepoManager: """ if self.does_repo_exist(name): - raise InvalidRepoName( - "That repo name you provided already exists." " Please choose another." + raise ExistingGitRepo( + "That repo name you provided already exists. Please choose another." ) # noinspection PyTypeChecker diff --git a/tests/cogs/downloader/test_downloader.py b/tests/cogs/downloader/test_downloader.py index 2f75800a6..6cb9ba245 100644 --- a/tests/cogs/downloader/test_downloader.py +++ b/tests/cogs/downloader/test_downloader.py @@ -3,9 +3,11 @@ from collections import namedtuple from pathlib import Path import pytest +from unittest.mock import MagicMock from raven.versioning import fetch_git_sha from redbot.cogs.downloader.repo_manager import RepoManager, Repo +from redbot.cogs.downloader.errors import ExistingGitRepo async def fake_run(*args, **kwargs): @@ -129,3 +131,13 @@ async def test_current_hash(bot_repo): sentry_sha = fetch_git_sha(str(bot_repo.folder_path)) assert sentry_sha == commit + + +@pytest.mark.asyncio +async def test_existing_repo(repo_manager): + repo_manager.does_repo_exist = MagicMock(return_value=True) + + with pytest.raises(ExistingGitRepo): + await repo_manager.add_repo("http://test.com", "test") + + repo_manager.does_repo_exist.assert_called_once_with("test")