aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | | * | | | | | | | | | | 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
| | | | | | * | | | | | | | Add logging to antimalware cog & expand user feedbackGravatar S. Co12020-03-01-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add generic handling for multi-file uploads * Log user, id, and blocked extensions * Provide the full list of attachment filenames as a logging extra * Provide feedback on all blacklisted file types uploaded
| | | | | | | | | * | | | | Convert "get_tags()" and "_get_tag()" to sync functionsGravatar RohanJnr2020-03-04-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "get_tags()" and "_get_tag()" functions need not be async as we are no longer doing any API call but instead reading from local files.
| | | | | | | | | * | | | | Use "pathlib" instead of "os" module and context managerGravatar RohanJnr2020-03-04-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pathlib module simplifies opening and reading files, hence the os module and the context manager are no longer used.
| | | | | | | | | * | | | | Merge branch 'tags_overhaul' of https://github.com/RohanJnr/bot into ↵Gravatar RohanJnr2020-02-29-895/+2636
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags_overhaul
| | | | | | | | | | * \ \ \ \ Merge branch 'master' into tags_overhaulGravatar Rohan2020-02-29-895/+2636
| | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #797 from Numerlor/fuzzy_zero_divGravatar Shirayuki Nekomata2020-02-29-26/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | Fix invalid tag names being passed to the tag cog.
| * | | | | | | | | | | | | | Merge branch 'master' into fuzzy_zero_divGravatar Shirayuki Nekomata2020-02-29-32/+479
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #710 from python-discord/eval-enhancementsGravatar Mark2020-02-28-32/+479
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eval cog improvements
| * | | | | | | | | | | | | | | Snekbox: mention re-evaluation feature in the command's docstringGravatar MarkKoz2020-02-28-1/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into eval-enhancementsGravatar MarkKoz2020-02-28-1440/+3084
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Ignore NotFound errors inside continue_evalGravatar Matteo2020-02-28-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could have caused some errors if the user delete his own message
| * | | | | | | | | | | | | | | Return only the new code in continue_eval and check for truthiness insteadGravatar Matteo2020-02-28-11/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use unicode code point instead of literal for the snekbox re-eval emojiGravatar Matteo2020-02-27-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicode literals aren't really safe compared to code points
| * | | | | | | | | | | | | | | Split the eval command procedure into two functions.Gravatar Matteo2020-02-27-114/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two functions were created: send_eval and continue_eval, in order to facilitate testing. The corresponding tests are also changed in this commit.
| * | | | | | | | | | | | | | | Merge branch 'master' into eval-enhancementsGravatar Matteo Bertucci2020-02-18-379/+350
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Use kwargs to set mock attributesGravatar Matteo2020-02-18-25/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Assert return value of Snekbox.post_evalGravatar Matteo2020-02-18-1/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use a space instead of an empty string in test_get_status_emoji Gravatar Matteo Bertucci2020-02-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the stripping, it should still be considered as empty Co-Authored-By: Mark <[email protected]>
| * | | | | | | | | | | | | | | | Delete additional informations from subtest Gravatar Matteo Bertucci2020-02-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce visual clutter Co-Authored-By: Mark <[email protected]>
| * | | | | | | | | | | | | | | | Split assertions onto separate lines Gravatar Matteo Bertucci2020-02-18-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reads better as separate lines Co-Authored-By: Mark <[email protected]>
| * | | | | | | | | | | | | | | | Split assertion onto separate linesGravatar Matteo Bertucci2020-02-18-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Mark <[email protected]>
| * | | | | | | | | | | | | | | | Snekbox small refactoringGravatar Matteo2020-02-18-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the code a bit clearer Co-authored-by: Shirayuki Nekomata <[email protected]>
| * | | | | | | | | | | | | | | | Suppress HTTPException while deleting bot outputGravatar Matteo2020-02-18-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was triggering an error if the user deleted the output before re-evaluating
| * | | | | | | | | | | | | | | | Use pregenerated partialsGravatar Matteo2020-02-18-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoid recreating partials for each re-eval
| * | | | | | | | | | | | | | | | Write tests for bot/cogs/test_snekbox.pyGravatar Akarys422020-02-09-0/+363
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Create an AsyncContextManagerMock mock for testing asynchronous context managersGravatar Akarys422020-02-09-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be used to test aiohttp request functions, since they are async context managers
| * | | | | | | | | | | | | | | | Use actual functions instead of lambdas for bot.wait_forGravatar Akarys422020-02-09-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of lambdas made the functions hard to test, this new format allows us to easily test those functions and document them.
| * | | | | | | | | | | | | | | | Merge branch 'master' into eval-enhancementsGravatar Matteo Bertucci2020-01-30-350/+648
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Re-eval snippet with emoji reactionGravatar Matteo Bertucci2020-01-29-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the eval message is edited after less than 10 seconds, an emoji is added to the message, and if the user adds the same, the snippet is re-evaluated. This make easier to correct snipper mistakes.