diff options
| author | teor <teor@torproject.org> | 2020-01-14 17:41:40 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-01-14 17:41:40 +1000 |
| commit | afa4cc57bf101eb3effbd233fc3d18265279fe8e (patch) | |
| tree | aa42eb6ae3cb13a55fdda671c0f3d28c09606766 | |
| parent | f1173a63fb905922a2ef13588a1999d85a24a9f6 (diff) | |
| parent | 7e111d0eaa05d5099d101e82afa1709438fe994e (diff) | |
| download | tor-afa4cc57bf101eb3effbd233fc3d18265279fe8e.tar.gz tor-afa4cc57bf101eb3effbd233fc3d18265279fe8e.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | changes/ticket32705_disable | 7 | ||||
| -rwxr-xr-x | scripts/maint/practracker/practracker.py | 2 | ||||
| -rwxr-xr-x | scripts/maint/practracker/test_practracker.sh | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable new file mode 100644 index 0000000000..6d5b0779ab --- /dev/null +++ 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 index f6aac9d15e..71741265f6 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -297,5 +297,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 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 () { |