test: improve tests (#117)

Author: peterdeme

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
         if: ${{ matrix.python == '3.7' }}
         run: make lint
 
-      - name: Install, test and code coverage with ${{ matrix.python }}
+      - name: Test with ${{ matrix.python }}
         env:
           STREAM_KEY: ${{ secrets.STREAM_KEY }}
           STREAM_SECRET: ${{ secrets.STREAM_SECRET }}

stream_chat/client.py

@@ -428,7 +428,7 @@ def send_file(
             f"{self.base_url}/{uri}",
             params=self.get_default_params(),
             data={"user": json.dumps(user)},
-            files={"file": (name, content, content_type)},
+            files={"file": (name, content, content_type)},  # type: ignore
             headers=headers,
         )
         return self._parse_response(response)

stream_chat/tests/async_chat/conftest.py

@@ -52,7 +52,8 @@ async def random_user(client: StreamChatAsync):
     response = await client.update_user(user)
     assert "users" in response
     assert user["id"] in response["users"]
-    return user
+    yield user
+    await hard_delete_users(client, [user["id"]])
 
 
 @pytest.fixture(scope="function")
@@ -61,24 +62,31 @@ async def server_user(client: StreamChatAsync):
     response = await client.update_user(user)
     assert "users" in response
     assert user["id"] in response["users"]
-    return user
+    yield user
+    await hard_delete_users(client, [user["id"]])
 
 
 @pytest.fixture(scope="function")
 async def random_users(client: StreamChatAsync):
     user1 = {"id": str(uuid.uuid4())}
     user2 = {"id": str(uuid.uuid4())}
-    await client.update_users([user1, user2])
-    return [user1, user2]
+    await client.upsert_users([user1, user2])
+    yield [user1, user2]
+    await hard_delete_users(client, [user1["id"], user2["id"]])
 
 
 @pytest.fixture(scope="function")
-async def channel(client, random_user: Dict):
+async def channel(client: StreamChatAsync, random_user: Dict):
     channel = client.channel(
         "messaging", str(uuid.uuid4()), {"test": True, "language": "python"}
     )
     await channel.create(random_user["id"])
-    return channel
+    yield channel
+
+    try:
+        await channel.delete()
+    except Exception:
+        pass
 
 
 @pytest.fixture(scope="function")
@@ -110,8 +118,23 @@ async def fellowship_of_the_ring(client: StreamChatAsync):
         },
         {"id": "peregrin-took", "name": "Peregrin Took", "race": "Hobbit", "age": 28},
     ]
-    await client.update_users(members)
+    await client.upsert_users(members)
     channel = client.channel(
         "team", "fellowship-of-the-ring", {"members": [m["id"] for m in members]}
     )
     await channel.create("gandalf")
+    yield
+    try:
+        await channel.delete()
+    except Exception:
+        pass
+    await hard_delete_users(client, [m["id"] for m in members])
+
+
+async def hard_delete_users(client: StreamChatAsync, user_ids: List[str]):
+    try:
+        await client.delete_users(
+            user_ids, "hard", conversations="hard", messages="hard"
+        )
+    except Exception:
+        pass

stream_chat/tests/async_chat/test_client.py

@@ -126,7 +126,7 @@ async def test_update_user(self, client: StreamChatAsync):
 
     async def test_update_users(self, client: StreamChatAsync):
         user = {"id": str(uuid.uuid4())}
-        response = await client.update_users([user])
+        response = await client.upsert_users([user])
         assert "users" in response
         assert user["id"] in response["users"]
 

stream_chat/tests/conftest.py

@@ -43,7 +43,8 @@ def random_user(client: StreamChat):
     response = client.update_user(user)
     assert "users" in response
     assert user["id"] in response["users"]
-    return user
+    yield user
+    hard_delete_users(client, [user["id"]])
 
 
 @pytest.fixture(scope="function")
@@ -52,15 +53,17 @@ def server_user(client: StreamChat):
     response = client.update_user(user)
     assert "users" in response
     assert user["id"] in response["users"]
-    return user
+    yield user
+    hard_delete_users(client, [user["id"]])
 
 
 @pytest.fixture(scope="function")
 def random_users(client: StreamChat):
     user1 = {"id": str(uuid.uuid4())}
     user2 = {"id": str(uuid.uuid4())}
     client.update_users([user1, user2])
-    return [user1, user2]
+    yield [user1, user2]
+    hard_delete_users(client, [user1["id"], user2["id"]])
 
 
 @pytest.fixture(scope="function")
@@ -69,7 +72,13 @@ def channel(client: StreamChat, random_user: Dict):
         "messaging", str(uuid.uuid4()), {"test": True, "language": "python"}
     )
     channel.create(random_user["id"])
-    return channel
+
+    yield channel
+
+    try:
+        channel.delete()
+    except Exception:
+        pass
 
 
 @pytest.fixture(scope="function")
@@ -106,3 +115,18 @@ def fellowship_of_the_ring(client: StreamChat):
         "team", "fellowship-of-the-ring", {"members": [m["id"] for m in members]}
     )
     channel.create("gandalf")
+
+    yield
+
+    try:
+        channel.delete()
+    except Exception:
+        pass
+    hard_delete_users(client, [m["id"] for m in members])
+
+
+def hard_delete_users(client: StreamChat, user_ids: List[str]):
+    try:
+        client.delete_users(user_ids, "hard", conversations="hard", messages="hard")
+    except Exception:
+        pass