Merge branch 'master' into compact_free

3 files changed, 0 insertions, 172 deletions

diff --git a/tests/cogs/sync/__init__.py b/tests/cogs/sync/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/cogs/sync/__init__.py
+++ /dev/null
diff --git a/tests/cogs/sync/test_roles.py b/tests/cogs/sync/test_roles.py
deleted file mode 100644
index c561ba447..000000000
--- a/tests/cogs/sync/test_roles.py
+++ /dev/null
@@ -1,103 +0,0 @@
-from bot.cogs.sync.syncers import Role, get_roles_for_sync
-
-
-def test_get_roles_for_sync_empty_return_for_equal_roles():
-    api_roles = {Role(id=41, name='name', colour=33, permissions=0x8, position=1)}
-    guild_roles = {Role(id=41, name='name', colour=33, permissions=0x8, position=1)}
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (set(), set(), set())
-
-
-def test_get_roles_for_sync_returns_roles_to_update_with_non_id_diff():
-    api_roles = {Role(id=41, name='old name', colour=35, permissions=0x8, position=1)}
-    guild_roles = {Role(id=41, name='new name', colour=33, permissions=0x8, position=2)}
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        set(),
-        guild_roles,
-        set(),
-    )
-
-
-def test_get_roles_only_returns_roles_that_require_update():
-    api_roles = {
-        Role(id=41, name='old name', colour=33, permissions=0x8, position=1),
-        Role(id=53, name='other role', colour=55, permissions=0, position=3)
-    }
-    guild_roles = {
-        Role(id=41, name='new name', colour=35, permissions=0x8, position=2),
-        Role(id=53, name='other role', colour=55, permissions=0, position=3)
-    }
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        set(),
-        {Role(id=41, name='new name', colour=35, permissions=0x8, position=2)},
-        set(),
-    )
-
-
-def test_get_roles_returns_new_roles_in_first_tuple_element():
-    api_roles = {
-        Role(id=41, name='name', colour=35, permissions=0x8, position=1),
-    }
-    guild_roles = {
-        Role(id=41, name='name', colour=35, permissions=0x8, position=1),
-        Role(id=53, name='other role', colour=55, permissions=0, position=2)
-    }
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        {Role(id=53, name='other role', colour=55, permissions=0, position=2)},
-        set(),
-        set(),
-    )
-
-
-def test_get_roles_returns_roles_to_update_and_new_roles():
-    api_roles = {
-        Role(id=41, name='old name', colour=35, permissions=0x8, position=1),
-    }
-    guild_roles = {
-        Role(id=41, name='new name', colour=40, permissions=0x16, position=2),
-        Role(id=53, name='other role', colour=55, permissions=0, position=3)
-    }
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        {Role(id=53, name='other role', colour=55, permissions=0, position=3)},
-        {Role(id=41, name='new name', colour=40, permissions=0x16, position=2)},
-        set(),
-    )
-
-
-def test_get_roles_returns_roles_to_delete():
-    api_roles = {
-        Role(id=41, name='name', colour=35, permissions=0x8, position=1),
-        Role(id=61, name='to delete', colour=99, permissions=0x9, position=2),
-    }
-    guild_roles = {
-        Role(id=41, name='name', colour=35, permissions=0x8, position=1),
-    }
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        set(),
-        set(),
-        {Role(id=61, name='to delete', colour=99, permissions=0x9, position=2)},
-    )
-
-
-def test_get_roles_returns_roles_to_delete_update_and_new_roles():
-    api_roles = {
-        Role(id=41, name='not changed', colour=35, permissions=0x8, position=1),
-        Role(id=61, name='to delete', colour=99, permissions=0x9, position=2),
-        Role(id=71, name='to update', colour=99, permissions=0x9, position=3),
-    }
-    guild_roles = {
-        Role(id=41, name='not changed', colour=35, permissions=0x8, position=1),
-        Role(id=81, name='to create', colour=99, permissions=0x9, position=4),
-        Role(id=71, name='updated', colour=101, permissions=0x5, position=3),
-    }
-
-    assert get_roles_for_sync(guild_roles, api_roles) == (
-        {Role(id=81, name='to create', colour=99, permissions=0x9, position=4)},
-        {Role(id=71, name='updated', colour=101, permissions=0x5, position=3)},
-        {Role(id=61, name='to delete', colour=99, permissions=0x9, position=2)},
-    )
diff --git a/tests/cogs/sync/test_users.py b/tests/cogs/sync/test_users.py
deleted file mode 100644
index a863ae35b..000000000
--- a/tests/cogs/sync/test_users.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from bot.cogs.sync.syncers import User, get_users_for_sync
-
-
-def fake_user(**kwargs):
-    kwargs.setdefault('id', 43)
-    kwargs.setdefault('name', 'bob the test man')
-    kwargs.setdefault('discriminator', 1337)
-    kwargs.setdefault('avatar_hash', None)
-    kwargs.setdefault('roles', (666,))
-    kwargs.setdefault('in_guild', True)
-    return User(**kwargs)
-
-
-def test_get_users_for_sync_returns_nothing_for_empty_params():
-    assert get_users_for_sync({}, {}) == (set(), set())
-
-
-def test_get_users_for_sync_returns_nothing_for_equal_users():
-    api_users = {43: fake_user()}
-    guild_users = {43: fake_user()}
-
-    assert get_users_for_sync(guild_users, api_users) == (set(), set())
-
-
-def test_get_users_for_sync_returns_users_to_update_on_non_id_field_diff():
-    api_users = {43: fake_user()}
-    guild_users = {43: fake_user(name='new fancy name')}
-
-    assert get_users_for_sync(guild_users, api_users) == (
-        set(),
-        {fake_user(name='new fancy name')}
-    )
-
-
-def test_get_users_for_sync_returns_users_to_create_with_new_ids_on_guild():
-    api_users = {43: fake_user()}
-    guild_users = {43: fake_user(), 63: fake_user(id=63)}
-
-    assert get_users_for_sync(guild_users, api_users) == (
-        {fake_user(id=63)},
-        set()
-    )
-
-
-def test_get_users_for_sync_updates_in_guild_field_on_user_leave():
-    api_users = {43: fake_user(), 63: fake_user(id=63)}
-    guild_users = {43: fake_user()}
-
-    assert get_users_for_sync(guild_users, api_users) == (
-        set(),
-        {fake_user(id=63, in_guild=False)}
-    )
-
-
-def test_get_users_for_sync_updates_and_creates_users_as_needed():
-    api_users = {43: fake_user()}
-    guild_users = {63: fake_user(id=63)}
-
-    assert get_users_for_sync(guild_users, api_users) == (
-        {fake_user(id=63)},
-        {fake_user(in_guild=False)}
-    )
-
-
-def test_get_users_for_sync_does_not_duplicate_update_users():
-    api_users = {43: fake_user(in_guild=False)}
-    guild_users = {}
-
-    assert get_users_for_sync(guild_users, api_users) == (set(), set())