mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 11:18:54 -05:00
e27682abd3
Previously, when downloader was loaded, the RepoManager would spawn a task to load available repos. If one repo failed loading for some reason, the function would raise and the remaining repos would never be loaded, however downloader would still appear to load correctly. This change handles exceptions better during repo loading, but also, if an unhandled exception is raised, downloader will fail to load as it should. Also included, as requested in #1968, is the --recurse-submodules flag in cloning/pulling repositories. This change resolves #1950. Signed-off-by: Toby Harradine <tobyharradine@gmail.com>
123 lines
3.6 KiB
Python
123 lines
3.6 KiB
Python
import pathlib
|
|
from collections import namedtuple
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from unittest.mock import MagicMock
|
|
from raven.versioning import fetch_git_sha
|
|
|
|
from redbot.pytest.downloader import *
|
|
|
|
from redbot.cogs.downloader.repo_manager import RepoManager, Repo
|
|
from redbot.cogs.downloader.errors import ExistingGitRepo
|
|
|
|
|
|
def test_existing_git_repo(tmpdir):
|
|
repo_folder = Path(str(tmpdir)) / "repos" / "squid" / ".git"
|
|
repo_folder.mkdir(parents=True, exist_ok=True)
|
|
|
|
r = Repo(
|
|
url="https://github.com/tekulvw/Squid-Plugins",
|
|
name="squid",
|
|
branch="rewrite_cogs",
|
|
folder_path=repo_folder.parent,
|
|
)
|
|
|
|
exists, _ = r._existing_git_repo()
|
|
|
|
assert exists is True
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_add_repo(monkeypatch, repo_manager):
|
|
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
|
|
|
|
squid = await repo_manager.add_repo(
|
|
url="https://github.com/tekulvw/Squid-Plugins", name="squid", branch="rewrite_cogs"
|
|
)
|
|
|
|
assert squid.available_modules == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_remove_repo(monkeypatch, repo_manager):
|
|
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
|
|
|
|
await repo_manager.add_repo(
|
|
url="https://github.com/tekulvw/Squid-Plugins", name="squid", branch="rewrite_cogs"
|
|
)
|
|
assert repo_manager.get_repo("squid") is not None
|
|
await repo_manager.delete_repo("squid")
|
|
assert repo_manager.get_repo("squid") is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_current_branch(bot_repo):
|
|
branch = await bot_repo.current_branch()
|
|
|
|
# So this does work, just not sure how to fully automate the test
|
|
|
|
assert branch not in ("WRONG", "")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_current_hash(bot_repo):
|
|
branch = await bot_repo.current_branch()
|
|
bot_repo.branch = branch
|
|
|
|
commit = await bot_repo.current_commit()
|
|
|
|
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")
|
|
|
|
|
|
def test_tree_url_parse(repo_manager):
|
|
cases = [
|
|
{
|
|
"input": ("https://github.com/Tobotimus/Tobo-Cogs", None),
|
|
"expected": ("https://github.com/Tobotimus/Tobo-Cogs", None),
|
|
},
|
|
{
|
|
"input": ("https://github.com/Tobotimus/Tobo-Cogs", "V3"),
|
|
"expected": ("https://github.com/Tobotimus/Tobo-Cogs", "V3"),
|
|
},
|
|
{
|
|
"input": ("https://github.com/Tobotimus/Tobo-Cogs/tree/V3", None),
|
|
"expected": ("https://github.com/Tobotimus/Tobo-Cogs", "V3"),
|
|
},
|
|
{
|
|
"input": ("https://github.com/Tobotimus/Tobo-Cogs/tree/V3", "V4"),
|
|
"expected": ("https://github.com/Tobotimus/Tobo-Cogs", "V4"),
|
|
},
|
|
]
|
|
|
|
for test_case in cases:
|
|
assert test_case["expected"] == repo_manager._parse_url(*test_case["input"])
|
|
|
|
|
|
def test_tree_url_non_github(repo_manager):
|
|
cases = [
|
|
{
|
|
"input": ("https://gitlab.com/Tobotimus/Tobo-Cogs", None),
|
|
"expected": ("https://gitlab.com/Tobotimus/Tobo-Cogs", None),
|
|
},
|
|
{
|
|
"input": ("https://my.usgs.gov/bitbucket/scm/Tobotimus/Tobo-Cogs", "V3"),
|
|
"expected": ("https://my.usgs.gov/bitbucket/scm/Tobotimus/Tobo-Cogs", "V3"),
|
|
},
|
|
]
|
|
|
|
for test_case in cases:
|
|
assert test_case["expected"] == repo_manager._parse_url(*test_case["input"])
|