fix test

Author: Datata1

tests/integration/conftest.py

@@ -16,7 +16,6 @@
 
 
 def pytest_addoption(parser):
-    """Add custom command line options for integration tests."""
     parser.addoption(
         "--run-integration",
         action="store_true",
@@ -26,14 +25,12 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
-    """Register custom markers."""
     config.addinivalue_line(
         "markers", "integration: mark test as integration test (requires API token)"
     )
 
 
 def pytest_collection_modifyitems(config, items):
-    """Skip integration tests unless --run-integration is passed."""
     if config.getoption("--run-integration"):
         return
 
@@ -121,19 +118,27 @@ async def test_workspaces(
 ) -> AsyncGenerator[List[Workspace], None]:
     created_workspaces: List[Workspace] = []
 
-    for i in range(2):
-        workspace_name = f"{TEST_WORKSPACE_PREFIX}-{i + 1}"
+    workspace_configs = [
+        {"name": f"{TEST_WORKSPACE_PREFIX}-1", "git_url": None},
+        {
+            "name": f"{TEST_WORKSPACE_PREFIX}-git",
+            "git_url": "https://github.com/octocat/Hello-World.git",
+        },
+    ]
+
+    for config in workspace_configs:
         payload = WorkspaceCreate(
             team_id=test_team_id,
-            name=workspace_name,
+            name=config["name"],
             plan_id=test_plan_id,
+            git_url=config["git_url"],
         )
         try:
             workspace = await session_sdk_client.workspaces.create(payload=payload)
             created_workspaces.append(workspace)
             log.info(f"Created test workspace: {workspace.name} (ID: {workspace.id})")
         except Exception as e:
-            log.error(f"Failed to create test workspace {workspace_name}: {e}")
+            log.error(f"Failed to create test workspace {config['name']}: {e}")
             for ws in created_workspaces:
                 try:
                     await ws.delete()
@@ -155,3 +160,17 @@ async def test_workspaces(
 @pytest.fixture(scope="session")
 async def test_workspace(test_workspaces: List[Workspace]) -> Workspace:
     return test_workspaces[0]
+
+
+@pytest.fixture(scope="session")
+def git_workspace_id(test_workspaces: List[Workspace]) -> int:
+    return test_workspaces[1].id
+
+
+@pytest.fixture
+async def workspace_with_git(
+    sdk_client: CodesphereSDK, git_workspace_id: int
+) -> Workspace:
+    workspace = await sdk_client.workspaces.get(workspace_id=git_workspace_id)
+    await workspace.wait_until_running(timeout=120.0)
+    return workspace

tests/integration/test_git.py

@@ -1,55 +1,26 @@
-from typing import AsyncGenerator
-
 import pytest
 
-from codesphere import CodesphereSDK
-from codesphere.resources.workspace import Workspace, WorkspaceCreate
+from codesphere.resources.workspace import Workspace
 
 pytestmark = pytest.mark.integration
 
 
-@pytest.fixture(scope="session")
-async def git_workspace(
-    session_sdk_client: CodesphereSDK,
-    test_team_id: int,
-    test_plan_id: int,
-) -> AsyncGenerator[Workspace, None]:
-    payload = WorkspaceCreate(
-        team_id=test_team_id,
-        name="sdk-git-integration-test-git",
-        plan_id=test_plan_id,
-        git_url="https://github.com/octocat/Hello-World.git",
-    )
-
-    workspace = await session_sdk_client.workspaces.create(payload=payload)
-
-    try:
-        await workspace.wait_until_running(timeout=120.0)
-        yield workspace
-    finally:
-        try:
-            await workspace.delete()
-        except Exception:
-            pass
-
-
 class TestGitIntegration:
     @pytest.mark.asyncio
-    async def test_get_head(self, git_workspace: Workspace):
-        result = await git_workspace.git.get_head()
+    async def test_get_head(self, workspace_with_git: Workspace):
+        result = await workspace_with_git.git.get_head()
 
         assert result.head is not None
         assert len(result.head) > 0
 
     @pytest.mark.asyncio
-    async def test_pull_default(self, git_workspace: Workspace):
-        # This should not raise an exception
-        await git_workspace.git.pull()
+    async def test_pull_default(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull()
 
     @pytest.mark.asyncio
-    async def test_pull_with_remote(self, git_workspace: Workspace):
-        await git_workspace.git.pull(remote="origin")
+    async def test_pull_with_remote(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull(remote="origin")
 
     @pytest.mark.asyncio
-    async def test_pull_with_remote_and_branch(self, git_workspace: Workspace):
-        await git_workspace.git.pull(remote="origin", branch="master")
+    async def test_pull_with_remote_and_branch(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull(remote="origin", branch="master")