commit d118388763151fd1e295c853277696f9eff8f881 Author: teor <teor@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" {} + fi + +# List of relay fingerprints to test with generate and lookup ## moria1, Serge, no caches extra info, no dir port, doesn't exist +TEST_RELAY_LIST=" +9695DFC35FFEB861329B9F1AB04C46397020CE31 +BA44A889E64B93FAA2B114E02C2A279A8555C533 +001524DD403D729F08F7E5D77813EF12756CFA8D +5AFAC3D00E97D6733112CC9CA2A788691FA87125 +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +" + ## 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 +# We need each relay fingerprint as a separate argument +# shellcheck disable=SC2086 +$PYTHON generateFallbackDirLine.py $TEST_RELAY_LIST +# shellcheck disable=SC2086 +$PYTHON lookupFallbackDirContact.py $TEST_RELAY_LIST ## If we get the top 200 relays from Onionoo, we generate a list with about ## 10 fallbacks