Black tests and setup.py (#1657)

This commit is contained in:
Will
2018-05-14 19:09:54 -04:00
committed by Tobotimus
parent b88b5a2601
commit e01cdbb091
12 changed files with 149 additions and 150 deletions

View File

@@ -22,6 +22,7 @@ async def fake_run_noprint(*args, **kwargs):
@pytest.fixture(scope="module", autouse=True)
def patch_relative_to(monkeysession):
def fake_relative_to(self, some_path: Path):
return self
@@ -38,14 +39,14 @@ def repo_manager(tmpdir_factory, config):
@pytest.fixture
def repo(tmpdir):
repo_folder = Path(str(tmpdir)) / 'repos' / 'squid'
repo_folder = Path(str(tmpdir)) / "repos" / "squid"
repo_folder.mkdir(parents=True, exist_ok=True)
return Repo(
url="https://github.com/tekulvw/Squid-Plugins",
name="squid",
branch="rewrite_cogs",
folder_path=repo_folder
folder_path=repo_folder,
)
@@ -63,19 +64,19 @@ def bot_repo(event_loop):
branch="WRONG",
url="https://empty.com/something.git",
folder_path=cwd,
loop=event_loop
loop=event_loop,
)
def test_existing_git_repo(tmpdir):
repo_folder = Path(str(tmpdir)) / 'repos' / 'squid' / '.git'
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
folder_path=repo_folder.parent,
)
exists, _ = r._existing_git_repo()
@@ -89,24 +90,21 @@ async def test_clone_repo(repo_norun, capsys):
clone_cmd, _ = capsys.readouterr()
clone_cmd = clone_cmd.strip('[\']').split('\', \'')
assert clone_cmd[0] == 'git'
assert clone_cmd[1] == 'clone'
assert clone_cmd[2] == '-b'
assert clone_cmd[3] == 'rewrite_cogs'
clone_cmd = clone_cmd.strip("[']").split("', '")
assert clone_cmd[0] == "git"
assert clone_cmd[1] == "clone"
assert clone_cmd[2] == "-b"
assert clone_cmd[3] == "rewrite_cogs"
assert clone_cmd[4] == repo_norun.url
assert 'repos/squid' in clone_cmd[5]
assert "repos/squid" in clone_cmd[5]
@pytest.mark.asyncio
async def test_add_repo(monkeypatch, repo_manager):
monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run",
fake_run_noprint)
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"
url="https://github.com/tekulvw/Squid-Plugins", name="squid", branch="rewrite_cogs"
)
assert squid.available_modules == []

View File

@@ -6,23 +6,16 @@ import pytest
from redbot.cogs.downloader.installable import Installable, InstallableType
INFO_JSON = {
"author": (
"tekulvw",
),
"author": ("tekulvw",),
"bot_version": (3, 0, 0),
"description": "A long description",
"hidden": False,
"install_msg": "A post-installation message",
"required_cogs": {},
"requirements": (
"tabulate"
),
"requirements": ("tabulate"),
"short": "A short description",
"tags": (
"tag1",
"tag2"
),
"type": "COG"
"tags": ("tag1", "tag2"),
"type": "COG",
}
@@ -30,7 +23,7 @@ INFO_JSON = {
def installable(tmpdir):
cog_path = tmpdir.mkdir("test_repo").mkdir("test_cog")
info_path = cog_path.join("info.json")
info_path.write_text(json.dumps(INFO_JSON), 'utf-8')
info_path.write_text(json.dumps(INFO_JSON), "utf-8")
cog_info = Installable(Path(str(cog_path)))
return cog_info

View File

@@ -4,9 +4,11 @@ import pytest
@pytest.fixture()
def bank(config):
from redbot.core import Config
Config.get_conf = lambda *args, **kwargs: config
from redbot.core import bank
bank._register_defaults()
return bank

View File

@@ -20,7 +20,7 @@ async def test_modlog_register_casetype(mod, ctx):
"default_setting": True,
"image": ":hammer:",
"case_str": "Ban",
"audit_type": "ban"
"audit_type": "ban",
}
casetype = await mod.register_casetype(**ct)
assert casetype is not None
@@ -29,6 +29,7 @@ async def test_modlog_register_casetype(mod, ctx):
@pytest.mark.asyncio
async def test_modlog_case_create(mod, ctx, member_factory):
from datetime import datetime as dt
usr = member_factory.get()
guild = ctx.guild
bot = ctx.bot
@@ -36,9 +37,7 @@ async def test_modlog_case_create(mod, ctx, member_factory):
moderator = ctx.author
reason = "Test 12345"
created_at = dt.utcnow()
case = await mod.create_case(
bot, guild, created_at, case_type, usr, moderator, reason
)
case = await mod.create_case(bot, guild, created_at, case_type, usr, moderator, reason)
assert case is not None
assert case.user == usr
assert case.action_type == case_type