fix: make live upload integration tests rerun-safe

Give the live upload tests unique per-run file names and content so
leftover pages on the shared test wiki can no longer trigger
fileexists-no-change errors, and move the wiki-side cleanup of the
target-fpt test into a finally block so failed runs do not leak state.

Author: raederan

.github/workflows/integration.yml

@@ -0,0 +1,35 @@
+# Integration tests against a live test wiki. Credentials come from the
+# INTEGR_TEST_* secrets; where they are unavailable (e.g. forks), the
+# credential fixtures make the tests skip instead of fail.
+
+name: Integration
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+concurrency:
+  # runs mutate the shared test wiki, so never run two in parallel
+  group: integration
+  cancel-in-progress: false
+
+jobs:
+  integration-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          # deep clone incl. tags so hatch-vcs can derive the version
+          fetch-depth: 0
+
+      - name: Set up the environment
+        uses: ./.github/actions/setup-python-env
+
+      - name: Run integration tests
+        env:
+          WIKI_DOMAIN: ${{ secrets.INTEGR_TEST_WIKI_DOMAIN }}
+          WIKI_USERNAME: ${{ secrets.INTEGR_TEST_WIKI_USERNAME }}
+          WIKI_PASSWORD: ${{ secrets.INTEGR_TEST_WIKI_PASSWORD }}
+        run: make test-integration

Makefile

@@ -22,6 +22,16 @@ test: ## Test the code with pytest (integration tests excluded, see pyproject.to
 	@echo ">> Testing code: Running pytest"
 	@uv run python -m pytest --cov --cov-config=pyproject.toml --cov-report=xml
 
+.PHONY: test-integration
+test-integration: ## Run integration tests (set WIKI_DOMAIN, WIKI_USERNAME, WIKI_PASSWORD [, DB_USERNAME, DB_PASSWORD]; tests skip where credentials are missing)
+	@echo ">> Testing code: Running pytest on tests/integration"
+	@uv run python -m pytest tests/integration -o addopts="" \
+		$(if $(WIKI_DOMAIN),--wiki_domain "$(WIKI_DOMAIN)") \
+		$(if $(WIKI_USERNAME),--wiki_username "$(WIKI_USERNAME)") \
+		$(if $(WIKI_PASSWORD),--wiki_password "$(WIKI_PASSWORD)") \
+		$(if $(DB_USERNAME),--db_username "$(DB_USERNAME)") \
+		$(if $(DB_PASSWORD),--db_password "$(DB_PASSWORD)")
+
 .PHONY: build
 build: clean-build ## Build wheel and sdist
 	@echo ">> Creating wheel and sdist files"

docs/dev.md

@@ -61,14 +61,25 @@ excluded by default:
 
 ### Integration tests
 
-Integration tests run against a live wiki and need credentials:
+Integration tests run against a live wiki and need credentials; tests
+whose credentials are missing skip instead of fail. CI runs them on
+every push to `main` (workflow `integration.yml`).
 
-```bash
-uv run pytest tests/integration -o addopts="" \
-    --wiki_domain "<domain>" \
-    --wiki_username "<login>" \
-    --wiki_password "<password>"
-```
+=== "make"
+
+    ```bash
+    WIKI_DOMAIN="<domain>" WIKI_USERNAME="<login>" WIKI_PASSWORD="<password>" \
+        make test-integration
+    ```
+
+=== "manual"
+
+    ```bash
+    uv run pytest tests/integration -o addopts="" \
+        --wiki_domain "<domain>" \
+        --wiki_username "<login>" \
+        --wiki_password "<password>"
+    ```
 
 ## Documentation
 

tests/integration/test_express.py

@@ -23,6 +23,7 @@
 """
 
 import os
+import uuid
 from contextlib import contextmanager
 from pathlib import Path
 
@@ -173,8 +174,9 @@ def test_file_upload_download(wiki_domain, wiki_username, wiki_password):
     assert osw_express_and_credentials(
         osw_express, wiki_domain, wiki_username, wiki_password
     )
-    # Test file upload
-    file_path = Path.cwd() / "test_file.txt"
+    # Test file upload; unique name per run so leftovers on the shared
+    # test wiki never collide with a re-upload (fileexists-no-change)
+    file_path = Path.cwd() / f"test_file_{uuid.uuid4().hex[:8]}.txt"
     create_dummy_file(file_path)
     # Upload a file to an OSW instance
     wiki_file = osw.express.osw_upload_file(file_path, osw_express=osw_express)

tests/integration/test_express_init.py

@@ -19,6 +19,7 @@
 """
 
 import os
+import uuid
 import warnings
 from contextlib import contextmanager
 from pathlib import Path
@@ -1130,9 +1131,11 @@ def test_live_upload_download_via_instance(
             osw_obj = osw.express.OswExpress(
                 domain=wiki_domain, cred_filepath=cred_filepath
             )
-            # Create dummy file
-            source_file = Path.cwd() / "test_instance_upload.txt"
-            source_file.write_text("Instance upload test content")
+            # Create dummy file; unique name/content per run so leftovers
+            # on the shared test wiki never collide with a re-upload
+            uid = uuid.uuid4().hex[:8]
+            source_file = Path.cwd() / f"test_instance_upload_{uid}.txt"
+            source_file.write_text(f"Instance upload test content {uid}")
 
             try:
                 # Upload via instance method
@@ -1146,7 +1149,9 @@ def test_live_upload_download_via_instance(
                     overwrite=True,
                 )
                 assert local_file.path.exists()
-                assert local_file.path.read_text() == "Instance upload test content"
+                assert local_file.path.read_text() == (
+                    f"Instance upload test content {uid}"
+                )
 
                 # Cleanup
                 local_file.close()
@@ -1175,14 +1180,22 @@ def test_live_upload_with_target_fpt(
             osw_obj = osw.express.OswExpress(
                 domain=wiki_domain, cred_filepath=cred_filepath
             )
-            source_file = Path.cwd() / "test_target_fpt_upload.txt"
-            source_file.write_text("Target FPT test content")
-
+            # Unique name and content per run: the shared test wiki keeps
+            # pages between runs, and re-uploading identical content raises
+            # a fileexists-no-change API error.
+            uid = uuid.uuid4().hex[:8]
+            content = f"Target FPT test content {uid}"
+            source_file = Path.cwd() / f"test_target_fpt_upload_{uid}.txt"
+            source_file.write_text(content)
+            title = f"File:TestTargetFptUpload{uid}.txt"
+
+            wiki_file = None
+            local_file = None
             try:
                 wiki_file = osw_obj.upload_file(
                     source=source_file,
-                    url_or_title="File:TestTargetFptUpload.txt",
-                    target_fpt="File:TestTargetFptUpload.txt",
+                    url_or_title=title,
+                    target_fpt=title,
                 )
                 assert wiki_file is not None
                 assert wiki_file.change_id is not None
@@ -1193,13 +1206,14 @@ def test_live_upload_with_target_fpt(
                     url_or_title=wiki_file.url_or_title,
                     overwrite=True,
                 )
-                assert local_file.path.read_text() == "Target FPT test content"
-
-                # Cleanup
-                local_file.close()
-                local_file.delete()
-                wiki_file.delete()
+                assert local_file.path.read_text() == content
             finally:
+                # best-effort cleanup so no state leaks onto the shared wiki
+                if local_file is not None:
+                    local_file.close()
+                    local_file.delete()
+                if wiki_file is not None:
+                    wiki_file.delete()
                 if source_file.exists():
                     source_file.unlink()
             osw_obj.shut_down()