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 (file)
index 0000000..ca60148
--- /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 590525660b1d56e7f329646e36c9265039fa9b4f..c7be227702d70b01b72e8dd2a37bb97e5d4b407a 100755 (executable)
--- 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 0ec4d96ad4e2b09bd2188efdd818256ccfb0f153..7cd1ecae36fc8475d30cc1431bb8291cb4ddd40b 100644 (file)
--- 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
 # ...