tor

commit 5ce45ac90750ebe9a5d482eef0d9e4a6eb4fbb38
parent c7baacf4c0855728077e553a4685577b1344ac82
Author: teor <teor@torproject.org>
Date:   Sat, 16 Nov 2019 21:44:44 +1000

Makefile/git scripts: Add the practracker unit tests

Add a check-practracker-unit-test target, and run it as part of
"make check".

Add the practracker unit tests to scripts/git/pre-commit.git-hook.

Part of 32609.

Diffstat:
M
Makefile.am
 | 
5
++++-
A
changes/ticket32609
 | 
3
+++
M
scripts/git/pre-commit.git-hook
 | 
13
++++++++-----

3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -253,7 +253,10 @@ test: all
 shellcheck:
 	$(top_srcdir)/scripts/maint/checkShellScripts.sh
 
-check-local: check-spaces check-changes check-includes check-best-practices shellcheck check-cocci
+check-practracker-unit-test:
+	$(top_srcdir)/scripts/maint/practracker/test_practracker.sh
+
+check-local: check-spaces check-changes check-includes check-practracker-unit-test check-best-practices shellcheck check-cocci
 
 need-chutney-path:
 	@if test ! -d "$$CHUTNEY_PATH"; then \
diff --git a/changes/ticket32609 b/changes/ticket32609
@@ -0,0 +1,3 @@
+  o Testing:
+    - Run the practracker unit tests as part of "make check", and in the
+      pre-commit git hook. Closes ticket 32609.
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
@@ -54,6 +54,13 @@ if [ -e scripts/maint/checkShellScripts.sh ]; then
     scripts/maint/checkShellScripts.sh
 fi
 
+# Always run the practracker unit tests
+PT_DIR=scripts/maint/practracker
+
+if [ -e "${PT_DIR}/test_practracker.sh" ]; then
+    "${PT_DIR}/test_practracker.sh"
+fi
+
 if [ ! "$CHECK_FILES" ]; then
     echo "No modified tor-owned source files, skipping further checks"
     exit 0
@@ -75,13 +82,9 @@ fi
 # Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists
 # We do this check so that we can enable practracker in hooks in master, and
 # disable it on maint branches
-PT_DIR=scripts/maint/practracker
-
 if [ -e "${PT_DIR}/practracker.py" ]; then
     if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
-        if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
-            exit 1
-        fi
+        python3 "${PT_DIR}/practracker.py" "$workdir"
     fi
 fi