aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* (Information Cog, !roles command test): Removed 's' at end of "Total 1 ↵Gravatar ks1232020-03-05-1/+1
| | | | role(s)" due changes in command.
* (Information Cog, !roles command): Added 's' to end of 'role' only if there ↵Gravatar ks1232020-03-05-1/+1
| | | | is more then 1 role.
* (Information Cog, !roles command test): Applied empty parameter change.Gravatar ks1232020-03-05-1/+1
|
* (Information Cog, !roles command): Added empty parameter to pagination (False)Gravatar ks1232020-03-05-1/+1
|
* Merge branch 'master' into roles-command-paginationGravatar S. Co12020-03-03-735/+507
|\
| * Merge pull request #750 from python-discord/bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-31/+93
| |\ | | | | | | Create AsyncResolver inside a coroutine to avoid DeprecationWarning
| | * Merge branch 'master' into bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-1048/+1367
| | |\ | | |/ | |/|
| * | Adding helpers to the Filtering whitelistGravatar Leon Sandøy2020-03-02-0/+1
| | | | | | | | | Resolves an issue mentioned in https://github.com/python-discord/bot/issues/767, giving Helpers access to post invites and other things caught by the Filtering cog.
| * | Merge pull request #783 from python-discord/python38-migrationGravatar S. Co12020-03-01-661/+301
| |\ \ | | | | | | | | Migrate bot to Python 3.8
| | * \ Merge branch 'master' into python38-migrationGravatar Leon Sandøy2020-03-01-2/+29
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #809 from python-discord/ban-grabify-urlsGravatar kwzrd2020-03-01-0/+24
| |\ \ \ | | | | | | | | | | Add grabify (IP logger) domains to banned domains
| | * | | Add grabify (IP logger) domains to banned domainsGravatar Joseph2020-03-01-0/+24
| |/ / /
| * | | Merge pull request #808 from spyoungtech/masterGravatar scragly2020-03-02-2/+5
| |\ \ \ | | | | | | | | | | Optimize Dockerfile for faster rebuilds
| | * \ \ Merge branch 'master' into masterGravatar scragly2020-03-02-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Optimize DockerfileGravatar Spencer Young2020-03-01-2/+5
| | | | |
| | | * | Modify log test regex to be non-os-specificGravatar S. Co12020-03-01-1/+1
| | | | | | | | | | | | | | | Previous regex utilized a `/`, which doesn't work for comparing against Windows paths, which use `\`
| | | * | Move syncer confirmation reaction check out of finally clauseGravatar S. Co12020-03-01-11/+11
| | | | | | | | | | | | | | | Returning directly out of a `finally` clause can cause any exceptions raised in the clause to be discarded, so we can remove the finally clause entirely and shift the control statements into the body of the function
| | | * | Bump Dependencies & RelockGravatar S. Co12020-03-01-78/+76
| | | | | | | | | | | | | | | * Remove explicit urllib3 pinning, CVE that caused its pinning has been resolved by 1.25+. This is a child dependency of requests.
| | | * | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-03-01-29/+71
| | | |\ \ | | |_|/ / | |/| | | | | | | | I have resolved a merge conflict in Pipfile.lock by relocking with the newly added dependencies of `coloredlogs` and `colorama`.
| * | | | Merge pull request #806 from python-discord/feat/frontend/b000/coloured-logsGravatar Eivind Teig2020-03-01-47/+89
| |\| | | | | | | | | | | | | Coloured log output
| | * | | Make logs coloured!Gravatar MarkKoz2020-02-29-7/+23
| | | | |
| | * | | Install the coloredlogs packageGravatar MarkKoz2020-02-29-40/+66
| |/ / / | | | | | | | | | | | | | | | | This makes it easy to add colour to the logs. Colorama is also installed if on a Windows system.
| | * | Migrate snekbox tests to Python 3.8's unittestGravatar Sebastiaan Zeeff2020-02-29-41/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've migrated the `tests/test_snekbox.py` file to use the new Python 3.8-style unittests instead of our old style using our custom Async mocks. In particular, I had to make a few changes: - Mocking the async post() context manager correctly Since `ClientSession.post` returns an async context manager when called, we need to make sure to assign the return value to the __aenter__ method of whatever `post()` returns, not of `post` itself (i.e.. when it's not called). - Use the new AsyncMock assert methods `assert_awaited_once` and `assert_awaited_once_with` Objects of the new `unittest.mock.AsyncMock` class have special methods to assert what they were called with that also assert that specific coroutine object was awaited. This means we test two things in one: Whether or not it was called with the right arguments and whether or not the returned coroutine object was then awaited. - Patch `functools.partial` as `partial` objects are compared by identity When you create two partial functions of the same function, you'll end up with two different `partial` objects. Since `partial` objects are compared by identity, you can't compare a `partial` created in a test method to that created in the callable you're trying to test. They will always compare as `False`. Since we're not interested in actually creating `partial` objects, I've just patched `functools.partial` in the namespace of the module we're testing to make sure we can compare them.
| | * | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-02-29-403/+1005
| | |\ \ | | |/ / | |/| | | | | | I've resolved the merge conflict by confirming the deleted part of tests/helpers.py
| | * | Use MagicMock as return value for _get_diff mockGravatar Sebastiaan Zeeff2020-02-24-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `_get_diff` method of TestSyncer class is mocked using an AsyncMock object. By default, when an AsyncMock object is called **and awaited**, it returns a child mock of the same time (another AsyncMock) according to the "the child is a like the parent" principle. This means that the _get_diff method will return an AsyncMock unless a different return_value is explicitly provided. Because of that "child is like parent" behavior, this will happen in lines 194-196 of bot.cogs.sync.syncers (annotations added by me): ``` // `diff` will be a child AsyncMock as "child is like parent" diff = await self._get_diff(guild) // `diff._asdict` will be an AsyncMock as "child is like parent" and, // after being called, it will return an unawaited coroutine object // we assign the name `diff_dict`: diff_dict = diff._asdict() // `diff_dict` is still an unawaited coroutine object meaning that it // doesn't have an `items()` method: totals = {k: len(v) for k, v in diff_dict.items() if v is not None} ``` Original, unannotated: https://github.com/python-discord/bot/blob/c81a4d401ea434e98b0a1ece51d3d10f1a3ad226/bot/cogs/sync/syncers.py#L194-L196 This will lead to the following exception when running the tests: ```py ====================================================================== ERROR: test_sync_confirmation_context_redirect (tests.bot.cogs.sync.test_base.SyncerSyncTests) (ctx=None, author=<MockMember name='mock.user' spec_set='Member' id='140583452034864'>, message=None) If ctx is given, a new message should be sent and author should be ctx's author. ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/sebastiaan/pydis/repositories/bot/tests/bot/cogs/sync/test_base.py", line 348, in test_sync_confirmation_context_redirect await self.syncer.sync(guild, ctx) File "/home/sebastiaan/pydis/repositories/bot/bot/cogs/sync/syncers.py", line 196, in sync totals = {k: len(v) for k, v in diff_dict.items() if v is not None} AttributeError: 'coroutine' object has no attribute 'items' ``` The solution is to assign an explicit return value so the parent mock doesn't "guess" and return an object of its own type. I previously did that by providing a specific `_Diff` object as the return value, but I should have gone with a `MagicMock` to signify that it's not an important return value; it's just something that needs to support/mimic the API we use on it. So that's what this commit adds.
| | * | Sync tests: use autospec instead of MockSyncerGravatar MarkKoz2020-02-23-18/+4
| | | | | | | | | | | | | | | | | | | | Autospec supports using AsyncMocks in 3.8 so there's no need to rely on a subclass of CustomMockMixin for the async mocks.
| | * | Migrate syncers test suite to Python 3.8Gravatar Sebastiaan Zeeff2020-02-24-75/+34
| | | | | | | | | | | | | | | | The test suite for the new role/member syncers used the "old"-style test suite with the helpers implemented for Python 3.7. I have migrated it to use the new Python 3.8 asyncio test helpers.
| | * | Use realistic mixin implementationGravatar Sebastiaan Zeeff2020-02-24-1/+1
| | | | | | | | | | | | | | | | Instead of using the mixin class bare, I've now included into a class tha subclasses unittest.TestCase as that's how it's going to be used "in the wild".
| | * | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-02-24-541/+1658
| | |\ \
| | * | | Update Dockerfile to use python:3.8-slimGravatar Sebastiaan Zeeff2020-02-24-1/+1
| | | | |
| | * | | Make Azure CI use Python 3.8 and Ubuntu 18.04Gravatar Sebastiaan Zeeff2020-02-24-2/+2
| | | | | | | | | | | | | | | | | | | | Since the bot is now using Python 3.8 and some of our dependencies have Python-version specfic dependencies, it's important that the CI, which installs from our Pipfile, uses the same version of Python.
| | * | | Fix test_time test and ensure coverageGravatar Sebastiaan Zeeff2020-02-23-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the test_time methods did not actually assert the exception message it was trying to detect as the assertion statement was contained within the context manager handling the exception. I've moved it out of the context so it actually runs. I've also added a few `praga: no cover` comments for parts that were artifically lowering coverage of the test suite.
| | * | | Use unittest's AsyncMock instead of our AsyncMockGravatar Sebastiaan Zeeff2020-02-23-213/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 3.8 introduced an `unittest.mock.AsyncMock` class that can be used to mock coroutines and other types of asynchronous operations like async iterators and async context managers. As we were using our custom, but limited, AsyncMock, I have replaced our mock with unittest's AsyncMock. Since Python 3.8 also introduces a different way of automatically detecting which attributes should be mocked with an AsyncMock, I've changed our CustomMockMixin to use this new method as well. Together with a couple other small changes, this means that our Custom Mocks now use a lazy method of detecting coroutine attributes, which significantly speeds up the test suite.
| | * | | Remove lingering pytest test_time.py fileGravatar Sebastiaan Zeeff2020-02-23-62/+0
| | | | | | | | | | | | | | | | | | | | I forgot to remove one pytest test file during the migration from pytest to unittest. Since we have sinced added a unittest version of the same file, I've now removed the lingering pytest file.
| | * | | Use IsolatedAsyncioTestCase instead of async_testGravatar Sebastiaan Zeeff2020-02-23-70/+13
| | | | | | | | | | | | | | | | | | | | Since we upgraded to Python 3.8, we can now use the new IsolatedAsyncioTestCase test class to use coroutine-based test methods instead of our own, custom async_test decorator. I have changed the base class for all of our test classes that use coroutine-based test methods and removed the now obsolete decorator from our helpers.
| | * | | Use mixin-composition not inheritance for LoggingTestCaseGravatar Sebastiaan Zeeff2020-02-23-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used inheritence to add additional logging assertion methods to unittest's TestCase class. However, with the introduction of the new IsolatedAsyncioTestCase this extension strategy means we'd have to create multiple child classes to be able to use the extended functionality in all of the TestCase variants. Since that leads to undesirable code reuse and an inheritance relationship is not at all needed, I've switched to a mixin-composition based approach that allows the user to extend the functionality of any TestCase variant with a mixin where needed.
| | * | | Update to Python 3.8 and discord.py 1.3.2Gravatar Sebastiaan Zeeff2020-02-23-79/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've changed the Python version in our Pipfile to Python 3.8. The main advantage of Python 3.8 is that it comes with significant upgrades to the unittest module which allow us to test asyncio-based code more easily. While our current test suite runs in P3.8 "out of the box", it currently still relies on many of the workarounds we had to use to test asynchronous code in Python 3.7. A future commit will replace these workarounds with the new tools available in Python 3.8. This commit also updates our discord.py version to 1.3.2. Versions of discord.py <= 1.3.1 contain a bug that causes errors in the new unittest tools that come with Python 3.8. For more specific details, see https://github.com/Rapptz/discord.py/pull/2570.
| | | | * Fix typo in commentGravatar Mark2020-03-03-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: Leon Sandøy <[email protected]>
| | | | * Merge remote-tracking branch 'origin/master' into ↵Gravatar MarkKoz2020-02-25-1156/+2657
| | | | |\ | | | | | | | | | | | | | | | | | | bug/backend/b748/resolver-in-coro
| | | | * | API: close existing open session before recreating itGravatar MarkKoz2020-02-15-3/+4
| | | | | |
| | | | * | API: add argument to force recreation of the sessionGravatar MarkKoz2020-02-15-4/+10
| | | | | |
| | | | * | Bot: send not-closed warnings as log messagesGravatar MarkKoz2020-02-15-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | "Real" warnings weren't showing up for some reason.
| | | | * | Bot: warn when connector/session not closed when recreatingGravatar MarkKoz2020-02-15-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aiohttp does warn too, but these warnings will provide more immediate feedback.
| | | | * | Bot: call _recreate() in clear()Gravatar MarkKoz2020-02-15-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because discord.py recreates the HTTPClient session, may as well follow suite and recreate our own stuff here too.
| | | | * | Bot: move connector/session recreation to a separate functionGravatar MarkKoz2020-02-15-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function itself doesn't need to be a coroutine. It just has to be called in a coroutine (or, more indirectly, in an async context?).
| | | | * | Bot: override login() instead of start()Gravatar MarkKoz2020-02-15-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client can be used without running a bot so it makes more sense for the connector to be created when logging in, which is done in both cases, rather than in start(), which is only used when running a bot.
| | | | * | Bot: fix error trying to close a None sessionGravatar MarkKoz2020-02-14-1/+3
| | | | | |
| | | | * | Bot: add warning for when connector is a specified kwargGravatar MarkKoz2020-02-13-0/+6
| | | | | |
| | | | * | Bot: avoid DeprecationWarning for aiohttp.AsyncResolver (fix #748)Gravatar MarkKoz2020-02-13-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncResolver has to be created inside a coroutine so it's moved inside start(). Consequently, the APIClient session is also recreated inside start() now. When using clear(), the default connector is used for the session it recreates because clear() is not a coroutine. This should only affect requests made to the Discord API via the Client when not using it to run a bot; starting the bot will re-create the session with the custom connector. * Close connector and resolver when bot closes
| | | | * | API: accept additional session kwargs for recreate()Gravatar MarkKoz2020-02-13-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These kwargs are merged with the kwargs given when the APIClient was created. This is useful for facilitating changing the session's connector with a new instance when the session needs to be recreated. * Rename _session_args attribute to _default_session_kwargs
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 03:22:57 +0000