mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2026-04-22 02:59:17 -04:00
Rip out Downloader's non-UI functionality into private core API (#6706)
This commit is contained in:
@@ -9,9 +9,9 @@ from pytest_mock import MockFixture
|
||||
|
||||
from redbot.pytest.downloader import *
|
||||
|
||||
from redbot.cogs.downloader.repo_manager import Installable
|
||||
from redbot.cogs.downloader.repo_manager import Candidate, ProcessFormatter, RepoManager, Repo
|
||||
from redbot.cogs.downloader.errors import (
|
||||
from redbot.core._downloader.repo_manager import Installable
|
||||
from redbot.core._downloader.repo_manager import Candidate, ProcessFormatter, RepoManager, Repo
|
||||
from redbot.core._downloader.errors import (
|
||||
AmbiguousRevision,
|
||||
ExistingGitRepo,
|
||||
GitException,
|
||||
@@ -322,9 +322,9 @@ async def test_update(mocker, repo):
|
||||
|
||||
|
||||
async def test_add_repo(monkeypatch, repo_manager):
|
||||
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr("redbot.core._downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr(
|
||||
"redbot.cogs.downloader.repo_manager.Repo.current_commit", fake_current_commit
|
||||
"redbot.core._downloader.repo_manager.Repo.current_commit", fake_current_commit
|
||||
)
|
||||
|
||||
squid = await repo_manager.add_repo(
|
||||
@@ -335,9 +335,9 @@ async def test_add_repo(monkeypatch, repo_manager):
|
||||
|
||||
|
||||
async def test_lib_install_requirements(monkeypatch, library_installable, repo, tmpdir):
|
||||
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr("redbot.core._downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr(
|
||||
"redbot.cogs.downloader.repo_manager.Repo.available_libraries", (library_installable,)
|
||||
"redbot.core._downloader.repo_manager.Repo.available_libraries", (library_installable,)
|
||||
)
|
||||
|
||||
lib_path = Path(str(tmpdir)) / "cog_data_path" / "lib"
|
||||
@@ -353,9 +353,9 @@ async def test_lib_install_requirements(monkeypatch, library_installable, repo,
|
||||
|
||||
|
||||
async def test_remove_repo(monkeypatch, repo_manager):
|
||||
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr("redbot.core._downloader.repo_manager.Repo._run", fake_run_noprint)
|
||||
monkeypatch.setattr(
|
||||
"redbot.cogs.downloader.repo_manager.Repo.current_commit", fake_current_commit
|
||||
"redbot.core._downloader.repo_manager.Repo.current_commit", fake_current_commit
|
||||
)
|
||||
|
||||
await repo_manager.add_repo(
|
||||
@@ -3,7 +3,7 @@ import subprocess as sp
|
||||
|
||||
import pytest
|
||||
|
||||
from redbot.cogs.downloader.repo_manager import ProcessFormatter, Repo
|
||||
from redbot.core._downloader.repo_manager import ProcessFormatter, Repo
|
||||
from redbot.pytest.downloader import (
|
||||
GIT_VERSION,
|
||||
cloned_git_repo,
|
||||
@@ -4,14 +4,14 @@ from pathlib import Path
|
||||
import pytest
|
||||
|
||||
from redbot.pytest.downloader import *
|
||||
from redbot.cogs.downloader.installable import Installable, InstallableType
|
||||
from redbot.core._downloader.installable import Installable, InstallableType
|
||||
from redbot.core import VersionInfo
|
||||
|
||||
|
||||
def test_process_info_file(installable):
|
||||
for k, v in INFO_JSON.items():
|
||||
if k == "type":
|
||||
assert installable.type == InstallableType.COG
|
||||
assert installable.type is InstallableType.COG
|
||||
elif k in ("min_bot_version", "max_bot_version"):
|
||||
assert getattr(installable, k) == VersionInfo.from_str(v)
|
||||
else:
|
||||
@@ -21,7 +21,7 @@ def test_process_info_file(installable):
|
||||
def test_process_lib_info_file(library_installable):
|
||||
for k, v in LIBRARY_INFO_JSON.items():
|
||||
if k == "type":
|
||||
assert library_installable.type == InstallableType.SHARED_LIBRARY
|
||||
assert library_installable.type is InstallableType.SHARED_LIBRARY
|
||||
elif k in ("min_bot_version", "max_bot_version"):
|
||||
assert getattr(library_installable, k) == VersionInfo.from_str(v)
|
||||
elif k == "hidden":
|
||||
Reference in New Issue
Block a user