Tests cleanup

README.md

@@ -36,7 +36,12 @@
  - Easy to "cache" (the external/public-facing microblog part)
    - With a good setup, cached content can be served most of the time
    - You can setup a "purge" hook to let you invalidate cache when the microblog was updated
- - Deployable with Docker
+ - Deployable with Docker (Docker compose for everything: dev, test and deployment)
+ - Focus on testing
+   - Tested against the [official ActivityPub test suite](https://test.activitypub.rocks/) ([ ] TODO submit the report)
+   - CI runs some local "federation" tests
+   - Manually tested against [Mastodon](https://github.com/tootsuite/mastodon)
+   - Project is running an up-to-date instance
 
 ## Running your instance
 

tests/federation_test.py

@@ -10,36 +10,64 @@ def resp2plaintext(resp):
     return html2text(resp.text)
 
 
-def test_federation():
+class Instance(object):
-    """Ensure the homepage is accessible."""
+    """Test instance wrapper."""
-    resp = requests.get('http://localhost:5006')
+
+    def __init__(self, host_url, docker_url=None):
+        self.host_url = host_url
+        self.docker_url = docker_url or host_url
+        self.session = requests.Session()
+
+    def ping(self):
+        """Ensures the homepage is reachable."""
+        resp = self.session.get(f'{self.host_url}/')
         resp.raise_for_status()
         assert resp.status_code == 200
 
-    resp = requests.get('http://localhost:5007')
+    def login(self):
+        resp = self.session.post(f'{self.host_url}/login', data={'pass': 'hello'})
         resp.raise_for_status()
         assert resp.status_code == 200
 
-    # Keep one session per instance
+    def follow(self, instance: 'Instance') -> None:
-
-    # Login
-    session1 = requests.Session()
-    resp = session1.post('http://localhost:5006/login', data={'pass': 'hello'})
-    assert resp.status_code == 200
-
-    # Login
-    session2 = requests.Session()
-    resp = session2.post('http://localhost:5007/login', data={'pass': 'hello'})
-    assert resp.status_code == 200
-
         # Instance1 follows instance2
-    resp = session1.get('http://localhost:5006/api/follow', params={'actor': 'http://instance2_web_1:5005'})
+        resp = self.session.get(f'{self.host_url}/api/follow', params={'actor': instance.docker_url})
         assert resp.status_code == 201
 
+        # We need to wait for the Follow/Accept dance
         time.sleep(10)
-    resp = requests.get('http://localhost:5007/followers', headers={'Accept': 'application/activity+json'})
+
+    def followers(self):
+        resp = self.session.get(f'{self.host_url}/followers', headers={'Accept': 'application/activity+json'})
         resp.raise_for_status()
 
-    print(resp.json())
+        data = resp.json()
 
-    assert resp.json()['first']['orderedItems'] == ['http://instance1_web_1:5005']
+        return resp.json()['first']['orderedItems']
+
+    def following(self):
+        resp = self.session.get(f'{self.host_url}/following', headers={'Accept': 'application/activity+json'})
+        resp.raise_for_status()
+
+        data = resp.json()
+
+        return resp.json()['first']['orderedItems']
+
+
+def test_federation():
+    """Ensure the homepage is accessible."""
+    instance1 = Instance('http://localhost:5006', 'http://instance1_web_1:5005')
+    instance1.ping()
+
+    instance2 = Instance('http://localhost:5007', 'http://instance2_web_1:5005')
+    instance2.ping()
+
+    # Login
+    instance1.login()
+    instance2.login()
+
+    # Instance1 follows instance2
+    instance1.follow(instance2)
+
+    assert instance2.followers() == [instance1.docker_url]
+    assert instance1.following() == [instance2.docker_url]