From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 13 Jan 2020 21:17:51 +0000 (-0500)
Subject: test_practracker.sh: never disable practracker
X-Git-Tag: tor-0.4.2.6~8^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b1592b56439ddbb9e47444f77de2d03429cc0ff;p=thirdparty%2Ftor.git

test_practracker.sh: never disable practracker

When practracker is disabled, its output will be empty.  We don't
want that happening during our tests.

Fixes bug 32705; bugfix on 0.4.2.1-alpha, when test_practracker.sh
was introduced.
---

diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable
new file mode 100644
index 0000000000..1da643175f
--- /dev/null
+++ b/changes/ticket32705_disable
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
+      test_practracker.sh script.  Doing so caused a test failure.
+      Fixes bug 32705; bugfix on 0.4.2.1-alpha.
diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh
index 9b107e071d..207a5ceded 100755
--- a/scripts/maint/practracker/test_practracker.sh
+++ b/scripts/maint/practracker/test_practracker.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 umask 077
+unset TOR_DISABLE_PRACTRACKER
 
 TMPDIR=""
 clean () {