Upgrade Tests to use pinned Ubuntu, Postgres in CI and work with Pytest 9 (#1349)

- Pin ubuntu and postgres to latest stable version in CI test runners
- Remove pytest marks from DB fixtures for pytest 9 compatibility

Author: debanjum

.github/workflows/run_evals.yml

@@ -85,7 +85,7 @@ jobs:
 
     services:
       postgres:
-        image: ankane/pgvector
+        image: pgvector/pgvector:pg18
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
   test:
     name: Run Tests
     runs-on: ubuntu-latest
-    container: ubuntu:latest
+    container: ubuntu:26.04
     strategy:
       fail-fast: false
       matrix:
@@ -41,7 +41,7 @@ jobs:
 
     services:
       postgres:
-        image: ankane/pgvector
+        image: pgvector/pgvector:pg18
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
@@ -66,13 +66,13 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          apt update && apt install -y git libegl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
+          apt update && apt install -y git libegl1 libgl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
 
       - name: ⬇️ Install Postgres
         env:
           DEBIAN_FRONTEND: noninteractive
         run : |
-          apt install -y postgresql postgresql-client && apt install -y postgresql-server-dev-16
+          apt install -y postgresql postgresql-client postgresql-server-dev-all
 
       - name: ⬇️ Install Application
         env:

tests/conftest.py

@@ -64,15 +64,13 @@ def search_config():
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_user():
     user = UserFactory()
     SubscriptionFactory(user=user)
     return user
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_user2():
     if KhojUser.objects.filter(username="default").exists():
@@ -87,7 +85,6 @@ def default_user2():
     return user
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_user3():
     """
@@ -105,7 +102,6 @@ def default_user3():
     return user
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_user4():
     """
@@ -123,7 +119,6 @@ def default_user4():
     return user
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def api_user(default_user):
     if KhojApiUser.objects.filter(user=default_user).exists():
@@ -136,7 +131,6 @@ def api_user(default_user):
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def api_user2(default_user2):
     if KhojApiUser.objects.filter(user=default_user2).exists():
@@ -149,7 +143,6 @@ def api_user2(default_user2):
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def api_user3(default_user3):
     if KhojApiUser.objects.filter(user=default_user3).exists():
@@ -162,7 +155,6 @@ def api_user3(default_user3):
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def api_user4(default_user4):
     if KhojApiUser.objects.filter(user=default_user4).exists():
@@ -175,14 +167,12 @@ def api_user4(default_user4):
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_openai_chat_model_option():
     chat_model = ChatModelFactory(name="gpt-4o-mini", model_type="openai")
     return chat_model
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def openai_agent():
     chat_model = ChatModelFactory(name="gpt-4o-mini", model_type="openai")
@@ -193,7 +183,6 @@ def openai_agent():
     )
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def default_process_lock():
     return ProcessLockFactory()

tests/test_grep_files.py

@@ -10,21 +10,19 @@
 
 
 @pytest.fixture
-@pytest.mark.django_db
-@pytest.mark.asyncio
-async def default_user():
-    user, _ = await KhojUser.objects.aget_or_create(
+def default_user():
+    user, _ = KhojUser.objects.get_or_create(
         username="test_user",
         password="test_password",
         email="test@example.com",
     )
     return user
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_simple_match(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Arrange
     await FileObjectAdapters.acreate_file_object(
@@ -50,10 +48,10 @@ async def test_grep_files_simple_match(default_user: KhojUser):
     assert "test.txt:3: hello again" in result["compiled"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_no_match(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Arrange
     await FileObjectAdapters.acreate_file_object(
@@ -78,10 +76,10 @@ async def test_grep_files_no_match(default_user: KhojUser):
     assert "No matches found." in result["compiled"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_with_path_prefix(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Arrange
     await FileObjectAdapters.acreate_file_object(
@@ -114,10 +112,10 @@ async def test_grep_files_with_path_prefix(default_user: KhojUser):
     assert "dir2/test2.txt" not in result["compiled"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_with_context(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Arrange
     await FileObjectAdapters.acreate_file_object(
@@ -149,10 +147,10 @@ async def test_grep_files_with_context(default_user: KhojUser):
     assert "line 5" not in result["compiled"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_invalid_regex(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Act
     results = [
@@ -169,10 +167,10 @@ async def test_grep_files_invalid_regex(default_user: KhojUser):
     assert "Invalid regex pattern" in result["compiled"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_multiple_files(default_user: KhojUser):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
     # Arrange
     await FileObjectAdapters.acreate_file_object(
@@ -222,12 +220,12 @@ async def test_grep_files_multiple_files(default_user: KhojUser):
         (r"\d{4}-\d{2}-\d{2}.*(sailing|sail|center for boats|captain sailor)", 1, "no flags or anchors"),
     ],
 )
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.asyncio
 async def test_grep_files_financial_entries_regex_patterns(
     default_user: KhojUser, regex_pattern: str, expected_matches: int, test_description: str
 ):
-    user = await default_user
+    user = default_user
     await FileObjectAdapters.adelete_all_file_objects(user=user)
 
     # Arrange - Create file with financial ledger content that has prefix text