tor

commit 8095c785f1929b379ab3341b42cbdb05c7598950
parent 8b46372f264450cb2a8876254c2ba4d0a64eb6dc
Author: teor <teor@torproject.org>
Date:   Tue, 14 Jan 2020 17:41:44 +1000

Merge branch 'maint-0.4.2'

Diffstat:
A
changes/ticket32705_disable
 | 
7
+++++++
M
scripts/maint/practracker/practracker.py
 | 
2
++
M
scripts/maint/practracker/test_practracker.sh
 | 
1
+

3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable
@@ -0,0 +1,7 @@
+  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.
+    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr
+      when skipping practracker checks.
+      Fixes bug 32705; bugfix on 0.4.2.1-alpha.
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
@@ -300,5 +300,7 @@ variable.
 
 if __name__ == '__main__':
     if os.environ.get("TOR_DISABLE_PRACTRACKER"):
+        print("TOR_DISABLE_PRACTRACKER is set, skipping practracker tests.",
+              file=sys.stderr)
         sys.exit(0)
     main(sys.argv)
diff --git 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 () {