January 2020 - tor-commits - lists.torproject.org

[fallback-scripts/master] test: Stop duplicating the list of relay fingerprints
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit d118388763151fd1e295c853277696f9eff8f881 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:03:30 2019 +1000 test: Stop duplicating the list of relay fingerprints Part of 28863. --- test.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test.sh b/test.sh index 0dc177a..7a7b23d 100755 --- a/test.sh +++ b/test.sh @@ -13,10 +13,23 @@ if command -v shellcheck; then find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} + … [View More]

1 0

[fallback-scripts/master] test: Add shellcheck tests
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 348c36e75c168a20c92ad3e6c17e56d9f9e2b249 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 13:34:12 2019 +1000 test: Add shellcheck tests Part of 28863. --- .travis.yml | 11 +++++++++++ test.sh | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index b7bfc94..a219026 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ matrix: packages: ## macOS needs pip(2) from homebrew python … [View More]

1 0

[fallback-scripts/master] generate: Handle new exceptions added by stem
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 22ac1c66a920cb0b6b4181df4a32a3e842ecb250 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 13:56:09 2019 +1000 generate: Handle new exceptions added by stem But maintain compatibility with older stem versions. Part of 28863. --- generateFallbackDirLine.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/generateFallbackDirLine.py b/generateFallbackDirLine.py index b856c93..2177e00 100755 --- a/generateFallbackDirLine.py +++ b/… [View More]

1 0

[fallback-scripts/master] test: Move tests from .travis.yml into test.sh
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 2e69c92783f24d781066df2b297190ee95214e91 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 13:31:52 2019 +1000 test: Move tests from .travis.yml into test.sh This change makes it easier to run the travis tests locally. Part of 28863. --- .travis.yml | 11 ++--------- test.sh | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d26ed93..b7bfc94 100644 --- a/.travis.yml +++ b/.travis.… [View More]yml @@ -117,15 +117,8 @@ install: script: ## Run some fallback-scripts tests - ## moria1, Serge, no caches extra info, no dir port, doesn't exist - ## TODO: validate output from all 3 commands using grep, grep, and stem? - - $PYTHON generateFallbackDirLine.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - - $PYTHON lookupFallbackDirContact.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - ## If we get the top 200 relays from Onionoo, we generate a list with about - ## 10 fallbacks - - export TOR_FB_ONIONOO_LIMIT=200 - ## Hide info-level logs - - $PYTHON updateFallbackDirs.py 2>&1 | tee -a fallback.log | grep -v "INFO::" + ## Outputs fallback.log with info-level logs + - ./test.sh after_failure: ## Show all the output, including info-level logs diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..a6bd19a --- /dev/null +++ b/test.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +set -v +set -e + +# Use the default python spelling, if the user hasn't specified one +PYTHON=${PYTHON:-python} + +## moria1, Serge, no caches extra info, no dir port, doesn't exist +## TODO: validate output from all 3 commands using grep, grep, and stem? +$PYTHON generateFallbackDirLine.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +$PYTHON lookupFallbackDirContact.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + +## If we get the top 200 relays from Onionoo, we generate a list with about +## 10 fallbacks +export TOR_FB_ONIONOO_LIMIT=200 +## Hide info-level logs +$PYTHON updateFallbackDirs.py 2>&1 | tee -a fallback.log | grep -v "INFO::" [View Less]

1 0

[fallback-scripts/master] test: Use single # for comments
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 5b38e8989b1d55c9319cecb1703e5b7e2781085d Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:05:17 2019 +1000 test: Use single # for comments And move a comment. Part of 28863. --- test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test.sh b/test.sh index 7a7b23d..6f2d5e2 100755 --- a/test.sh +++ b/test.sh @@ -13,9 +13,10 @@ if command -v shellcheck; then find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} + … [View More]

1 0

[fallback-scripts/master] test: Add more fingerprints of each type
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 965fb032481ad7437ead68d8aa414eb12a59e59d Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:25:52 2019 +1000 test: Add more fingerprints of each type Some relays are unreliable, but we still want the tests to check the different types of relays. Part of 28863. --- test.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test.sh b/test.sh index 6f2d5e2..bffebc1 100755 --- a/test.sh +++ b/test.sh @@ -16,12 +16,14 @@ fi # … [View More]

1 0

[fallback-scripts/master] lookup: Explicitly say "no contact"
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 218778081da63af9b4dbe7cfddb59cab86259b07 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:26:48 2019 +1000 lookup: Explicitly say "no contact" Rather than just printing "None". Part of 28863. --- lookupFallbackDirContact.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lookupFallbackDirContact.py b/lookupFallbackDirContact.py index 14c53d1..88bad62 100755 --- a/lookupFallbackDirContact.py +++ b/lookupFallbackDirContact.py @… [View More]

1 0

[fallback-scripts/master] generate: py3: Update using six.moves
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 3830e30575f4b19664cf90c0abbaec1d28f3be77 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:54:32 2019 +1000 generate: py3: Update using six.moves Part of 28863. --- generateFallbackDirLine.py | 5 +++-- requirements.txt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generateFallbackDirLine.py b/generateFallbackDirLine.py index 2177e00..f5e7424 100755 --- a/generateFallbackDirLine.py +++ b/generateFallbackDirLine.py @@ -7,7 +7,… [View More]

1 0

[fallback-scripts/master] lookup: py3: Use py3's print function
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 108d97403fb1194952aab2dd359150f9dbd3f82d Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:55:05 2019 +1000 lookup: py3: Use py3's print function Part of 28863. --- lookupFallbackDirContact.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lookupFallbackDirContact.py b/lookupFallbackDirContact.py index 88bad62..db17bd7 100755 --- a/lookupFallbackDirContact.py +++ b/lookupFallbackDirContact.py @@ -11,7 +11,7 @@ import sys import … [View More]

1 0

[fallback-scripts/master] test: Handle the log file in Travis, not the test script
by teor＠torproject.org 20 Jan '20

20 Jan '20

commit 34df66d2b648b61a714b7ba5450eb15f7a7d6259 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 14:45:20 2019 +1000 test: Handle the log file in Travis, not the test script Part of 28863. --- .travis.yml | 4 ++-- test.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a219026..2d0bcf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,8 +128,8 @@ install: script: ## Run some fallback-scripts tests - #… [View More]

1 0