Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 12:12:54 +01:00
Code Issues Projects Releases Wiki Activity

Fediverse: Lower timeout of networkless tests.

Browse Source 
There are many calls to assertSnarfNoResponse, so there's a lot
of time wasted sleeping, while these commands are fast enough
to answer in less than 0.1s
This commit is contained in:
Valentin Lorentz 2020-05-10 21:42:41 +02:00
parent dc2fe4d5f3
commit 27edb4f6c9
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
plugins/Fediverse/test.py
View File

@ -58,7 +58,7 @@ from .test_data import (
)
class FediverseTestCase(ChannelPluginTestCase):
class BaseFediverseTestCase(ChannelPluginTestCase):
config = {
# Allow snarfing the same URL twice in a row
"supybot.snarfThrottle": 0.0
@ -74,6 +74,25 @@ class FediverseTestCase(ChannelPluginTestCase):
with open(path, "wb") as fd:
fd.write(PRIVATE_KEY)
class NetworkedFediverseTestCase(BaseFediverseTestCase):
if network:
def testNetworkProfile(self):
self.assertRegexp("profile @val@oc.todon.fr", "0E082B40E4376B1E")
# TODO: add a test with an instance which only allows fetches
# with valid signatures.
def testNetworkProfileUnknown(self):
self.assertResponse(
"profile @nonexistinguser@oc.todon.fr",
"Error: Unknown user @nonexistinguser@oc.todon.fr.",
)
class NetworklessFediverseTestCase(BaseFediverseTestCase):
timeout = 0.1
@contextlib.contextmanager
def mockRequests(self, expected_requests):
with Manager() as m:
@ -105,19 +124,6 @@ class FediverseTestCase(ChannelPluginTestCase):
list(expected_requests), [], "Less requests than expected."
)
if network:
def testNetworkProfile(self):
self.assertRegexp("profile @val@oc.todon.fr", "0E082B40E4376B1E")
# TODO: add a test with an instance which only allows fetches
# with valid signatures.
def testNetworkProfileUnknown(self):
self.assertResponse(
"profile @nonexistinguser@oc.todon.fr",
"Error: Unknown user @nonexistinguser@oc.todon.fr.",
)
def testFeaturedNone(self):
featured = {
"@context": "https://www.w3.org/ns/activitystreams",
@ -220,9 +226,7 @@ class FediverseTestCase(ChannelPluginTestCase):
def testProfileSnarfer(self):
with self.mockRequests([]):
self.assertSnarfNoResponse(
"aaa @nonexistinguser@example.org bbb", timeout=1
)
self.assertSnarfNoResponse("aaa @nonexistinguser@example.org bbb")
with conf.supybot.plugins.Fediverse.snarfers.username.context(True):
expected_requests = [
@ -244,13 +248,13 @@ class FediverseTestCase(ChannelPluginTestCase):
with self.mockRequests(expected_requests):
self.assertSnarfNoResponse(
"aaa @nonexistinguser@example.org bbb", timeout=1
"aaa @nonexistinguser@example.org bbb"
)
def testProfileUrlSnarfer(self):
with self.mockRequests([]):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser bbb", timeout=1
"aaa https://example.org/users/someuser bbb"
)
with conf.supybot.plugins.Fediverse.snarfers.profile.context(True):
@ -258,7 +262,7 @@ class FediverseTestCase(ChannelPluginTestCase):
with self.mockRequests(expected_requests):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser bbb", timeout=1
"aaa https://example.org/users/someuser bbb"
)
expected_requests = [(ACTOR_URL, ACTOR_DATA)]
@ -361,8 +365,7 @@ class FediverseTestCase(ChannelPluginTestCase):
def testStatusUrlSnarferDisabled(self):
with self.mockRequests([]):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser/statuses/1234 bbb",
timeout=1,
"aaa https://example.org/users/someuser/statuses/1234 bbb"
)
def testStatusUrlSnarfer(self):
@ -385,8 +388,7 @@ class FediverseTestCase(ChannelPluginTestCase):
with self.mockRequests(expected_requests):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser/statuses/1234 bbb",
timeout=1,
"aaa https://example.org/users/someuser/statuses/1234 bbb"
)
expected_requests = [
@ -407,8 +409,7 @@ class FediverseTestCase(ChannelPluginTestCase):
with self.mockRequests(expected_requests):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser/statuses/1234 bbb",
timeout=1,
"aaa https://example.org/users/someuser/statuses/1234 bbb"
)
# Sends a request, notices it's a profile, gives up
@ -417,7 +418,7 @@ class FediverseTestCase(ChannelPluginTestCase):
with self.mockRequests(expected_requests):
self.assertSnarfNoResponse(
"aaa https://example.org/users/someuser/ bbb", timeout=1
"aaa https://example.org/users/someuser/ bbb"
)