cocalc-api: adjust org tests after changes to organization logic in server

Author: haraldschilly

src/python/cocalc-api/src/cocalc_api/hub.py

@@ -10,7 +10,8 @@ class Hub:
     def __init__(self, api_key: str, host: str = "https://cocalc.com"):
         self.api_key = api_key
         self.host = host
-        self.client = httpx.Client(auth=(api_key, ""), headers={"Content-Type": "application/json"})
+        # Use longer timeout for API calls (30 seconds instead of default 5)
+        self.client = httpx.Client(auth=(api_key, ""), headers={"Content-Type": "application/json"}, timeout=30.0)
 
     def call(self, name: str, arguments: list[Any], timeout: Optional[int] = None) -> Any:
         """

src/python/cocalc-api/src/cocalc_api/project.py

@@ -10,7 +10,8 @@ def __init__(self, api_key: str, host: str = "https://cocalc.com", project_id: O
         self.project_id = project_id
         self.api_key = api_key
         self.host = host
-        self.client = httpx.Client(auth=(api_key, ""), headers={"Content-Type": "application/json"})
+        # Use longer timeout for API calls (30 seconds instead of default 5)
+        self.client = httpx.Client(auth=(api_key, ""), headers={"Content-Type": "application/json"}, timeout=30.0)
 
     def call(self, name: str, arguments: list[Any], timeout: Optional[int] = None) -> Any:
         """

src/python/cocalc-api/tests/conftest.py

@@ -47,12 +47,10 @@ def hub(api_key, cocalc_host):
 
 
 @pytest.fixture(scope="session")
-def temporary_project(hub):
+def temporary_project(hub, request):
     """
     Create a temporary project for testing and return project info.
-
-    Note: Since there's no project deletion API available, the project
-    will remain after tests. It can be manually deleted if needed.
+    Uses a session-scoped fixture so only ONE project is created for the entire test suite.
     """
     import time
 
@@ -61,15 +59,20 @@ def temporary_project(hub):
     title = f"CoCalc API Test {timestamp}"
     description = "Temporary project created by cocalc-api tests"
 
+    print("\n" + "="*70)
+    print("=== Creating temporary project for entire test session ===")
+    print("=== THIS SHOULD ONLY PRINT ONCE ===")
+    print("="*70)
     project_id = hub.projects.create_project(title=title, description=description)
+    print(f"Created project {project_id}")
+    print("="*70)
 
     # Start the project so it can respond to API calls
     try:
         hub.projects.start(project_id)
-        print(f"Started project {project_id}, waiting for it to become ready...")
+        print(f"Starting project {project_id}, waiting for it to become ready...")
 
         # Wait for project to be ready (can take 10-15 seconds)
-        import time
         from cocalc_api import Project
 
         for attempt in range(10):
@@ -82,34 +85,39 @@ def temporary_project(hub):
                 break
             except Exception:
                 if attempt == 9:  # Last attempt
-                    print(f"Warning: Project {project_id} did not become ready within 50 seconds")
+                    print(f"⚠ Warning: Project {project_id} did not become ready within 50 seconds")
 
     except Exception as e:
-        print(f"Warning: Failed to start project {project_id}: {e}")
+        print(f"⚠ Warning: Failed to start project {project_id}: {e}")
 
     project_info = {'project_id': project_id, 'title': title, 'description': description}
 
-    yield project_info
-
-    # Cleanup: Stop the project and attempt to delete it
-    print(f"\nCleaning up test project '{title}' (ID: {project_id})...")
-
-    try:
-        # Stop the project first
-        print(f"  Stopping project {project_id}...")
-        hub.projects.stop(project_id)
-        print(f"  Project {project_id} stopped successfully")
-    except Exception as e:
-        print(f"  Failed to stop project {project_id}: {e}")
-
-    try:
-        # Delete the project using the new delete method
-        print(f"  Deleting project {project_id}...")
-        hub.projects.delete(project_id)
-        print(f"  Project {project_id} deleted successfully")
-    except Exception as e:
-        print(f"  Failed to delete project {project_id}: {e}")
-        print("  Project is stopped but may still exist - manual cleanup recommended")
+    # Register cleanup using finalizer (more reliable than yield teardown)
+    def cleanup():
+        print(f"\n=== Cleaning up test project '{title}' (ID: {project_id}) ===")
+
+        try:
+            # Stop the project first
+            print(f"Stopping project {project_id}...")
+            hub.projects.stop(project_id)
+            print("✓ Project stop command sent")
+            # Wait for the project process to actually terminate
+            time.sleep(3)
+            print(f"✓ Waited for project {project_id} to stop")
+        except Exception as e:
+            print(f"⚠ Failed to stop project {project_id}: {e}")
+
+        try:
+            # Delete the project
+            print(f"Deleting project {project_id}...")
+            hub.projects.delete(project_id)
+            print(f"✓ Project {project_id} deleted")
+        except Exception as e:
+            print(f"⚠ Failed to delete project {project_id}: {e}")
+
+    request.addfinalizer(cleanup)
+
+    return project_info
 
 
 @pytest.fixture(scope="session")

src/python/cocalc-api/tests/test_hub.py

@@ -12,11 +12,26 @@ class TestHubSystem:
     """Tests for Hub system operations."""
 
     def test_ping(self, hub):
-        """Test basic ping connectivity."""
-        result = hub.system.ping()
-        assert result is not None
-        # The ping response should contain some basic server info
-        assert isinstance(result, dict)
+        """Test basic ping connectivity with retry logic."""
+        # Retry with exponential backoff in case server is still starting up
+        max_attempts = 5
+        delay = 2  # Start with 2 second delay
+
+        for attempt in range(max_attempts):
+            try:
+                result = hub.system.ping()
+                assert result is not None
+                # The ping response should contain some basic server info
+                assert isinstance(result, dict)
+                print(f"✓ Server ping successful on attempt {attempt + 1}")
+                return  # Success!
+            except Exception as e:
+                if attempt < max_attempts - 1:
+                    print(f"Ping attempt {attempt + 1} failed, retrying in {delay}s... ({e})")
+                    time.sleep(delay)
+                    delay *= 2  # Exponential backoff
+                else:
+                    pytest.fail(f"Server ping failed after {max_attempts} attempts: {e}")
 
     def test_hub_initialization(self, api_key, cocalc_host):
         """Test Hub client initialization."""
@@ -31,11 +46,12 @@ def test_invalid_api_key(self, cocalc_host):
         with pytest.raises((ValueError, RuntimeError, Exception)):  # Should raise authentication error
             hub.system.ping()
 
-    def test_ping_timeout(self, api_key, cocalc_host):
-        """Test ping with timeout parameter."""
-        hub = Hub(api_key=api_key, host=cocalc_host)
-        result = hub.system.ping()
-        assert result is not None
+    def test_multiple_pings(self, hub):
+        """Test that multiple ping calls work consistently."""
+        for _i in range(3):
+            result = hub.system.ping()
+            assert result is not None
+            assert isinstance(result, dict)
 
 
 class TestHubProjects:
@@ -50,8 +66,22 @@ def test_create_project(self, hub):
 
         project_id = hub.projects.create_project(title=title, description=description)
 
-        assert project_id is not None
-        assert_valid_uuid(project_id, "Project ID")
+        try:
+            assert project_id is not None
+            assert_valid_uuid(project_id, "Project ID")
+            print(f"✓ Created project: {project_id}")
+        finally:
+            # Cleanup: stop then delete the project
+            try:
+                print(f"Cleaning up test project {project_id}...")
+                hub.projects.stop(project_id)
+                print("✓ Project stop command sent")
+                time.sleep(3)  # Wait for process to terminate
+                print(f"✓ Waited for project {project_id} to stop")
+                hub.projects.delete(project_id)
+                print(f"✓ Project {project_id} deleted")
+            except Exception as e:
+                print(f"⚠ Failed to cleanup project {project_id}: {e}")
 
     def test_list_projects(self, hub):
         """Test listing projects."""
@@ -131,13 +161,19 @@ def test_project_lifecycle(self, hub):
             else:
                 print("5. Skipping command execution - project not ready")
 
-            # 3. Delete the project
-            print("6. Deleting project...")
+            # 3. Stop and delete the project
+            print("6. Stopping project...")
+            hub.projects.stop(project_id)
+            print("   ✓ Project stop command sent")
+            time.sleep(3)  # Wait for process to terminate
+            print("   ✓ Waited for project to stop")
+
+            print("7. Deleting project...")
             delete_result = hub.projects.delete(project_id)
-            print(f"   Delete result: {delete_result}")
+            print(f"   ✓ Delete result: {delete_result}")
 
             # 4. Verify project is marked as deleted in database
-            print("7. Verifying project is marked as deleted...")
+            print("8. Verifying project is marked as deleted...")
             projects = hub.projects.get(fields=['project_id', 'title', 'deleted'], project_id=project_id, all=True)
             assert len(projects) == 1, f"Expected 1 project (still in DB), found {len(projects)}"
             project = projects[0]
@@ -148,12 +184,16 @@ def test_project_lifecycle(self, hub):
             print("✅ Project lifecycle test completed successfully!")
 
         except Exception as e:
-            # Cleanup: attempt to delete project if test fails
+            # Cleanup: attempt to stop and delete project if test fails
             print(f"\n❌ Test failed: {e}")
             try:
-                print("Attempting cleanup...")
+                print("Attempting cleanup: stopping then deleting project...")
+                hub.projects.stop(project_id)
+                print("✓ Project stop command sent")
+                time.sleep(3)  # Wait for process to terminate
+                print("✓ Waited for project to stop")
                 hub.projects.delete(project_id)
-                print("✓ Cleanup successful")
+                print("✓ Project deleted")
             except Exception as cleanup_error:
                 print(f"❌ Cleanup failed: {cleanup_error}")
             raise e