From c94d3cf3bf3eb1b2f807f132837e0d9eac4eceb8 Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@timmy-foundation.com>
Date: Wed, 15 Apr 2026 11:09:27 -0400
Subject: [PATCH] fix: ACP test collection fails without acp extra; ssh mark
 unregistered (#779)

Resolves #779. Two issues fixed:

tests/acp/conftest.py (new):
- Module-level collect_ignore when acp is not installed
- Prevents pytest --collect-only from failing with ModuleNotFoundError
- 6 ACP test files cleanly skipped instead of erroring

tests/conftest.py:
- Registered ssh, integration, slow pytest markers
- Eliminates PytestUnknownMarkWarning

Before: 11,470 collected, 6 errors
After:  11,472 collected, 0 errors
---
 tests/acp/conftest.py | 20 ++++++++++++++++++++
 tests/conftest.py     |  8 ++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/acp/conftest.py

diff --git a/tests/acp/conftest.py b/tests/acp/conftest.py
new file mode 100644
index 000000000..5e1e976a9
--- /dev/null
+++ b/tests/acp/conftest.py
@@ -0,0 +1,20 @@
+"""ACP test conftest — skip collection when acp extra not installed.
+
+This conftest.py uses collect_ignore at module level to prevent
+pytest from trying to import test files that depend on acp.
+"""
+
+try:
+    import acp  # noqa: F401
+except ImportError:
+    # Tell pytest to skip this entire directory during collection
+    collect_ignore = [
+        "test_entry.py",
+        "test_events.py",
+        "test_mcp_e2e.py",
+        "test_permissions.py",
+        "test_server.py",
+        "test_session.py",
+        "test_tools.py",
+        "test_auth.py",
+    ]
diff --git a/tests/conftest.py b/tests/conftest.py
index 021140466..ab20eec94 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,6 +15,12 @@ PROJECT_ROOT = Path(__file__).parent.parent
 if str(PROJECT_ROOT) not in sys.path:
     sys.path.insert(0, str(PROJECT_ROOT))
 
+# Register custom markers
+def pytest_configure(config):
+    config.addinivalue_line("markers", "ssh: marks tests requiring SSH connectivity")
+    config.addinivalue_line("markers", "integration: marks integration tests")
+    config.addinivalue_line("markers", "slow: marks slow tests")
+
 
 @pytest.fixture(autouse=True)
 def _isolate_hermes_home(tmp_path, monkeypatch):
@@ -119,3 +125,5 @@ def _enforce_test_timeout():
     yield
     signal.alarm(0)
     signal.signal(signal.SIGALRM, old)
+
+