diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable new file mode 100644 index 0000000000000000000000000000000000000000..6d5b0779ab713745ecf4333340bf022679e3d4fc --- /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 e1845c43e36b99048e509d1fe5e35d2fc00889d5..e806aef3b4b06114c9e72784284af99b1ed9f56d 100755 --- 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 index 9b107e071d2b07d82387d7c3ba03bd25ebbd8177..207a5ceded9a6ee5e3d34c644d3e38f5f03b04ed 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 () {