aboutsummaryrefslogtreecommitdiffstats
path: root/tests/base.py (unfollow)
Commit message (Collapse)AuthorLines
2020-05-28Make prefix consts private and more precise.Gravatar Leon Sandøy-9/+9
2020-05-28Reduce complexity on some of the typestring stuff.Gravatar Leon Sandøy-31/+9
- Refactor error messages in _to_typestring and _from_typestring to just print the prefix tuples instead of that custom error string. - Create a RedisKeyOrValue type to simplify some annotations. - Simplify partialmethod calls. - Make the signatures for _to_typestring and _from_typestring one-liners - Fix a typo in the errors.
2020-05-27Fix ATROCIOUS comment.Gravatar Leon Sandøy-3/+5
I should be shot.
2020-05-27Refactor typestring converters to partialmethods.Gravatar Leon Sandøy-30/+24
We're using functools.partialmethod to make the code a little cleaner and more readable here. Read more about them here: https://docs.python.org/3/library/functools.html#functools.partial https://docs.python.org/3/library/functools.html#functools.partialmethod
2020-05-27Floats are no longer permitted as RedisCache keys.Gravatar Leon Sandøy-43/+86
Also added a test for this. This is the DRYest approach I could find. It's a little ugly, but I think it's probably good enough.
2020-05-27Add some tests for `in_whitelist_check`.Gravatar Leon Sandøy-0/+48
2020-05-27Remove the now deprecated in_channel_check.Gravatar Leon Sandøy-16/+0
This check was no longer being used anywhere, having been replaced by in_whitelist_check.
2020-05-27Refactor .increment and add lock test.Gravatar Leon Sandøy-65/+109
The way we were doing the asyncio.Lock() stuff for increment was slightly problematic. @aeros has adviced us that it's better to just initialize the lock as None in __init__, and then initialize it inside the first coroutine that uses it instead. This ensures that the correct loop gets attached to the lock, so we don't end up getting errors like this one: RuntimeError: got Future <Future pending> attached to a different loop This happens because the lock and the actual calling coroutines aren't on the same loop. When creating a new test, test_increment_lock, we discovered that we needed a small refactor here and also in the test class to make this new test pass. So, now we're creating a DummyCog for every test method, and this will ensure the loop streams never cross. Cause we all know we must never cross the streams.
2020-05-27Clear cache in asyncSetUp instead of tests.Gravatar Leon Sandøy-6/+1
2020-05-27Allow some commands to fail checks silently.Gravatar Leon Sandøy-2/+9
For example, we don't want the mod commands to produce any kind of error message when run by ordinary users in regular channels - these should have the perception of being invisible and unavailable.
2020-05-27No redirect for mod management.Gravatar Leon Sandøy-0/+1
2020-05-27Find + change all InWhitelistCheckFailure importsGravatar Leon Sandøy-9/+8
2020-05-27Allow infraction management in modmail categoryGravatar Leon Sandøy-12/+13
2020-05-27Refactor the in_whitelist deco to a check.Gravatar Leon Sandøy-53/+86
We're moving the actual predicate into the `utils.checks` folder, just like we're doing with most of the other decorators. This is to allow us the flexibility to use it as a pure check, not only as a decorator. This commit doesn't actually change any functionality, just moves it around.
2020-05-26Add /r/FlutterDev to the guild invite whitelistGravatar Dennis Pham-0/+1
2020-05-26Add a test for RuntimeErrors.Gravatar Leon Sandøy-0/+22
This just tests that the various RuntimeErrors are reachable - that includes the error about not having a bot instance, the one about not being a class attribute, and the one about not having instantiated the class. This test addresses a concern raised by @MarkKoz in a review. I've decided not to test that actual contents of these RuntimeErrors, because I believe that sort of testing is a bit too brittle. It shouldn't break a test just to change the content of an error string.
2020-05-26Swap the order for the validate_cache checks.Gravatar Leon Sandøy-8/+8
2020-05-26Improve some docstrings for RedisCache.Gravatar Leon Sandøy-5/+3
Thanks @MarkKoz!
2020-05-26Make self.increment_lock private.Gravatar Leon Sandøy-2/+2
2020-05-26Add better docstring for RedisCache.updateGravatar Leon Sandøy-2/+12
2020-05-26Fix edge case where pop might not delete.Gravatar Leon Sandøy-6/+6
If you passed a key for a value that was the same as your optional, it would just return it but not delete it. This edge case isn't worth it, so I'm just removing that condition and letting the extra API call fly.
2020-05-26Turn log.exception into log.errorGravatar Leon Sandøy-17/+22
Also, refactor error messages to be consistent and DRY throughout the file.
2020-05-26[stats] Do not report modmail channels to statsGravatar Joseph Banks-1/+11
2020-05-25Expose the redis port to the hostGravatar MarkKoz-0/+2
Useful for those that run redis with docker-compose but not the bot. The bot on the host won't have access to the Docker network in such case so the port must be exposed.
2020-05-25Improve output of section name in config validation subtestsGravatar MarkKoz-1/+1
2020-05-25Support validating collection types for constantsGravatar MarkKoz-8/+32
This is a simple validation that only check the type of the collection. It does not validate the types inside the collection because that has proven to be quite complex.
2020-05-24Add support for Union type annotations for constantsGravatar MarkKoz-12/+19
Note that `Optional[x]` is just an alias for `Union[None, x]` so this effectively supports `Optional` too. This was especially troublesome because the redis password must be unset/None in order to avoid authentication, but the test would complain that `None` isn't a `str`. Setting to an empty string would pass the test but then make redis authenticate and fail.
2020-05-24Add discord.gift to URL blacklist, closes #958Gravatar Joseph Banks-0/+1
2020-05-24Improve error and error testing for incrementGravatar Leon Sandøy-1/+9
Changed a RuntimeError to a KeyError (thanks @MarkKoz), and also added some tests to ensure that the right errors are raised whenever this method is used incorrectly.
2020-05-24Add an option to use fakeredis in Bot.Gravatar Leon Sandøy-48/+66
Without this option, all contributors would need to set up a Redis server in order to run the bot. But with use_fakeredis set to True, this is no longer necessary because it will just set up a fakeredis redis pool instead of trying to contact an actual server. This is more than good enough for most local testing purposes, since data persistence across restarts isn't really relevant for them. This also means we need to move fakeredis into our real dependency list instead of having it as a dev dependency, so there's a minor change for that as well. I also made a small kaizen change to sort all the dependencies in the Pipfile alphabetically.
2020-05-24MockBot needs to be aware of redis_readyGravatar Leon Sandøy-1/+1
Forgot to update the additional_spec_asyncs when changing the name of this Bot attribute to be public.
2020-05-24Add logging to the RedisCache.Gravatar Leon Sandøy-3/+39
Mostly trace and exception logging.
2020-05-24Rename Bot._redis_ready to Bot.redis_readyGravatar Leon Sandøy-4/+4
It's a public attribute, we're accessing it from RedisCache.
2020-05-24Add .increment and .decrement methods.Gravatar Leon Sandøy-0/+69
Sometimes, we just want to store a counter in the cache. In this case, it is convenient to have a single method that will allow us to increment or decrement this counter. These methods allow you to decrement or increment floats and integers by an specified amount. By default, it'll increment or decrement by 1. Since this involves several API requests, we create an asyncio.Lock so that we don't end up with race conditions.
2020-05-24Make .items return ItemsView instead of AsyncIterGravatar Leon Sandøy-9/+23
There really was no compelling reason why this method should return an AsyncIterator or than that `async for items in cache.items()` has nice readability, but there were a few concerns. One is a concern about race conditions raised by @SebastiaanZ, and @MarkKoz raised a concern that it was misleading to have an AsyncIterator that only "pretended" to be lazy. To address these concerns, I've refactored it to return a regular ItemsView instead. I also improved the docstring, and fixed the relevant tests.
2020-05-24Better RuntimeErrors.Gravatar Leon Sandøy-2/+14
We provide suggestions for how to solve these problems now.
2020-05-24Improves various docstrings and comments.Gravatar Leon Sandøy-10/+27
Thanks to @MarkKoz for suggesting most of these in their code review.
2020-05-24Refactor the nice prefix/type strings to constantsGravatar Leon Sandøy-31/+19
It's leaner to just move that code out of the class and up to the module level as constants. This commit also renames ValidRedisType to RedisType.
2020-05-24len(prefix) instead of hardcoding 2Gravatar Leon Sandøy-1/+1
Co-authored-by: Mark <[email protected]>
2020-05-24use __name__ for type list Gravatar Leon Sandøy-1/+1
Instead of relying on __str__ representation, we'll use the __name__ dunder. Co-authored-by: Mark <[email protected]>
2020-05-23Show a warning when redis pool isn't closedGravatar MarkKoz-0/+5
2020-05-23Remove redis session mock from MockBotGravatar MarkKoz-16/+0
It's not feasible to mock it because all the commands return futures rather than being coroutines, so they cannot automatically be turned into AsyncMocks. Furthermore, no code should ever use the redis session directly besides RedisCache. Since the tests for RedisCache already use fakeredis, there's no use in trying to mock redis in MockBot.
2020-05-23DRY approach to typestring prefix resolutionGravatar Leon Sandøy-15/+60
Thanks to @kwzrd for this idea, basically we're making a constant with the typestring prefixes and iterating that in all our converters. These converter functions will also now raise TypeErrors if we try to convert something that isn't in this constants list. I've also added a new test that tests this functionality.
2020-05-23Don't rely on HDEL ignoring keys for .popGravatar Leon Sandøy-2/+21
Previously we would try to .delete keys that did not exist if a default was provided when calling .pop. This is okay to do (because HDEL will just ignore any attempts to delete non-existing calls), but it does add an additional pointless API call to Redis, so I've added some validation as a small optimization. This also adds a few additional lines of documentation as requested by @SebastiaanZ in their review.
2020-05-23Fix typo in test_to_dict docstringGravatar Leon Sandøy-1/+1
2020-05-23Update exception message Gravatar Leon Sandøy-1/+4
This was incorrectly suggesting the user needed to create an instance of RedisCache, when in fact it is the parent that needs to be instantiated. Co-authored-by: Sebastiaan Zeeff <[email protected]>
2020-05-23CI needs REDIS_PASSWORD to pass testsGravatar Leon Sandøy-0/+1
2020-05-23Moving the Redis session creation to Bot._recreateGravatar Leon Sandøy-2/+5
2020-05-23Unbreak the error_handlerGravatar Leon Sandøy-1/+1
2020-05-23Better docstring for RedisCache.containsGravatar Leon Sandøy-1/+5