From b65e8c72dffe637d3a78f733866c212d823503c3 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 27 Mar 2023 13:55:53 -0400
Subject: [PATCH] Skip the tor integration tests if any needed tor tools are
 missing

---
 integration/conftest.py  | 7 +++----
 newsfragments/4000.minor | 0
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 newsfragments/4000.minor

diff --git a/integration/conftest.py b/integration/conftest.py
index 33e7998c1..5970e5ba4 100644
--- a/integration/conftest.py
+++ b/integration/conftest.py
@@ -451,10 +451,9 @@ def chutney(reactor, temp_dir):
     chutney_dir = join(temp_dir, 'chutney')
     mkdir(chutney_dir)
 
-    # TODO:
-
-    # check for 'tor' binary explicitly and emit a "skip" if we can't
-    # find it
+    missing = [exe for exe in ["tor", "tor-gencert"] if not which(exe)]
+    if missing:
+        pytest.skip(f"Some command-line tools not found: {missing}")
 
     # XXX yuck! should add a setup.py to chutney so we can at least
     # "pip install <path to tarball>" and/or depend on chutney in "pip
diff --git a/newsfragments/4000.minor b/newsfragments/4000.minor
new file mode 100644
index 000000000..e69de29bb