From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Aug 2019 18:01:43 +0000 (-0400)
Subject: practracker: Add unit tests to test script, and test script to makefile
X-Git-Tag: tor-0.4.2.1-alpha~107^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa60fee8d56af01f6fefca17f945bdd00d195571;p=thirdparty%2Ftor.git

practracker: Add unit tests to test script, and test script to makefile

This makes all of the practracker tests get run by make check, and
hence by our CI.

Closes ticket 31304.
---

diff --git a/changes/ticket31304 b/changes/ticket31304
new file mode 100644
index 0000000000..ca60148b0c
--- /dev/null
+++ b/changes/ticket31304
@@ -0,0 +1,3 @@
+  o Minor features (tests):
+    - The practracker tests are now run as part of the Tor test suite.
+      Closes ticket 31304.
diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh
index 590525660b..c7be227702 100755
--- a/scripts/maint/practracker/test_practracker.sh
+++ b/scripts/maint/practracker/test_practracker.sh
@@ -29,6 +29,10 @@ run_practracker() {
         "${DATA}/" "$@";
 }
 
+echo "unit tests:"
+
+"${PYTHON:-python}" "${PRACTRACKER_DIR}/practracker_tests.py" || exit 1
+
 echo "ex0:"
 
 run_practracker --exceptions "${DATA}/ex0.txt" > "${TMPDIR}/ex0-received.txt"
diff --git a/src/test/include.am b/src/test/include.am
index 0ec4d96ad4..7cd1ecae36 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -31,7 +31,11 @@ TESTSCRIPTS += \
 endif
 
 if USEPYTHON
-TESTSCRIPTS += src/test/test_ntor.sh src/test/test_hs_ntor.sh src/test/test_bt.sh
+TESTSCRIPTS += \
+	src/test/test_ntor.sh \
+	src/test/test_hs_ntor.sh \
+	src/test/test_bt.sh \
+	scripts/maint/practracker/test_practracker.sh
 
 if COVERAGE_ENABLED
 # ...