March 2018 - tor-commits - lists.torproject.org

[tor/master] test: more data on geoip load failure.
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit bb9012c818124a6fed3321bdbd6bc46c63e89341 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:48:15 2018 -0400 test: more data on geoip load failure. --- src/test/test_geoip.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c index a5e11cc59..be1376a3b 100644 --- a/src/test/test_geoip.c +++ b/src/test/test_geoip.c @@ -404,7 +404,11 @@ test_geoip_load_file(void *arg) geoip_db_digest(AF_INET)); const char FNAME[] = SRCDIR "/src/config/geoip"; - tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, FNAME)); + int rv = geoip_load_file(AF_INET, FNAME); + if (rv != 0) { + TT_GRIPE(("Unable to load geoip from %s", escaped(FNAME))); + } + tt_int_op(0, OP_EQ, rv); /* Check that we loaded some countries; this will fail if there are ever * fewer than 50 countries in the world. */

1 0

[tor/master] Merge remote-tracking branch 'fristonio/ticket-24740'
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit e263317e07e61e7adbb3515b46a978997a9d20c0 Merge: 11114c7e8 930b98558 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:22:58 2018 -0400 Merge remote-tracking branch 'fristonio/ticket-24740' changes/ticket24740 | 5 +++++ src/or/networkstatus.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/master] Fix redundant authority certificate fetch
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 930b9855819ff80f165930fa4096ef063e802274 Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Sun Mar 4 21:13:58 2018 +0530 Fix redundant authority certificate fetch - Fixes #24740 - Fetch certificates only in those cases when consensus are waiting for certs. --- changes/ticket24740 | 5 +++++ src/or/networkstatus.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/changes/ticket24740 b/changes/ticket24740 new file mode 100644 index 000000000..253cdb65e --- /dev/null +++ b/changes/ticket24740 @@ -0,0 +1,5 @@ + o Minor bugfixes (directory server cert fetch): + - Fixed launching a certificate fetch always during the scheduled + periodic consensus fetch by fetching only in those cases when + consensus are waiting for certs. + Fixes bug 24740; bugfix on 0.2.9.1-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 87825e719..f7c26149e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -951,9 +951,12 @@ update_consensus_networkstatus_downloads(time_t now) continue; } - /* Check if we're waiting for certificates to download */ - if (check_consensus_waiting_for_certs(i, now, &consensus_dl_status[i])) + /** Check if we're waiting for certificates to download. If we are, + * launch download for missing directory authority certificates. */ + if (check_consensus_waiting_for_certs(i, now, &consensus_dl_status[i])) { + update_certificate_downloads(now); continue; + } /* Try the requested attempt */ log_info(LD_DIR, "Launching %s standard networkstatus consensus " @@ -1230,16 +1233,20 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) return 0; } -/** Launch requests for networkstatus documents and authority certificates as - * appropriate. */ +/** Launch requests for networkstatus documents as appropriate. This is called + * when we retry all the connections on a SIGHUP and periodically by a Periodic + * event which checks whether we want to download any networkstatus documents. + */ void update_networkstatus_downloads(time_t now) { const or_options_t *options = get_options(); if (should_delay_dir_fetches(options, NULL)) return; + /** Launch a consensus download request, we will wait for the consensus to + * download and when it completes we will launch a certificate download + * request. */ update_consensus_networkstatus_downloads(now); - update_certificate_downloads(now); } /** Launch requests as appropriate for missing directory authority

1 0

[tor/release-0.3.3] tests: Automatically detect Rust crates to test and also pass --verbose.
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 657d5cbbbc09948416bcc4f717cbfb64761a908d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 20 20:46:19 2018 +0000 tests: Automatically detect Rust crates to test and also pass --verbose. * FIXES #25560: https://bugs.torproject.org/25560. --- changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/changes/bug25560 b/changes/bug25560 new file mode 100644 index 000000000..5947fa03a --- /dev/null +++ b/changes/bug25560 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, rust): + - Some of our Rust crates were not having their tests run with `make + test-rust` due to a static string in the `src/test/test_rust.sh` script + specifying which crates to test. Rust crates are not automatically + detected and tested. Fixes bug 25560; bugfix on 0.3.3.3-alpha. diff --git a/src/test/include.am b/src/test/include.am index 1a49367c6..b768f7447 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -360,4 +360,4 @@ EXTRA_DIST += \ src/test/test_workqueue_socketpair.sh test-rust: - $(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh + $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh" diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 133f2bb94..d87336e70 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -1,20 +1,15 @@ #!/bin/sh # Test all Rust crates -crates="protover tor_util smartlist tor_allocate" - -exitcode=0 - set -e -for crate in $crates; do - cd "${abs_top_builddir:-../../..}/src/rust" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ - || exitcode=1 - cd - -done +CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + find "${abs_top_srcdir:-../../..}/src/rust" \ + -mindepth 2 -maxdepth 2 \ + -type f -name 'Cargo.toml' \ + -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path '{}' \; + +exit $? -exit $exitcode

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 11114c7e83161beb8adb47556ff437261498d618 Merge: fae525478 79d3f401a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:18:47 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 22 ++++++++-------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --cc src/test/test_rust.sh index 0268668b3,d87336e70..c35c57456 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@@ -1,20 -1,15 +1,14 @@@ #!/bin/sh # Test all Rust crates - crates="protover tor_util smartlist tor_allocate" - - exitcode=0 - set -e - for crate in $crates; do - cd "${abs_top_builddir:-../../..}/src/rust" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ - || exitcode=1 - cd - - done + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + find "${abs_top_srcdir:-../../..}/src/rust" \ + -mindepth 2 -maxdepth 2 \ + -type f -name 'Cargo.toml' \ + -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path '{}' \; - exit $exitcode + exit $? -

1 0

[tor/maint-0.3.3] Merge branch 'bug25560_rebased_033' into maint-0.3.3
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 79d3f401a5c87a61ca153af207039158db5f7874 Merge: 2b3138741 657d5cbbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:18:20 2018 -0400 Merge branch 'bug25560_rebased_033' into maint-0.3.3 changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.3.3] tests: Automatically detect Rust crates to test and also pass --verbose.
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 657d5cbbbc09948416bcc4f717cbfb64761a908d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 20 20:46:19 2018 +0000 tests: Automatically detect Rust crates to test and also pass --verbose. * FIXES #25560: https://bugs.torproject.org/25560. --- changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/changes/bug25560 b/changes/bug25560 new file mode 100644 index 000000000..5947fa03a --- /dev/null +++ b/changes/bug25560 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, rust): + - Some of our Rust crates were not having their tests run with `make + test-rust` due to a static string in the `src/test/test_rust.sh` script + specifying which crates to test. Rust crates are not automatically + detected and tested. Fixes bug 25560; bugfix on 0.3.3.3-alpha. diff --git a/src/test/include.am b/src/test/include.am index 1a49367c6..b768f7447 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -360,4 +360,4 @@ EXTRA_DIST += \ src/test/test_workqueue_socketpair.sh test-rust: - $(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh + $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh" diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 133f2bb94..d87336e70 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -1,20 +1,15 @@ #!/bin/sh # Test all Rust crates -crates="protover tor_util smartlist tor_allocate" - -exitcode=0 - set -e -for crate in $crates; do - cd "${abs_top_builddir:-../../..}/src/rust" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ - || exitcode=1 - cd - -done +CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + find "${abs_top_srcdir:-../../..}/src/rust" \ + -mindepth 2 -maxdepth 2 \ + -type f -name 'Cargo.toml' \ + -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path '{}' \; + +exit $? -exit $exitcode

1 0

[tor/release-0.3.3] Merge branch 'bug25560_rebased_033' into maint-0.3.3
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 79d3f401a5c87a61ca153af207039158db5f7874 Merge: 2b3138741 657d5cbbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:18:20 2018 -0400 Merge branch 'bug25560_rebased_033' into maint-0.3.3 changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-)

1 0

[tor/master] tests: Automatically detect Rust crates to test and also pass --verbose.
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 657d5cbbbc09948416bcc4f717cbfb64761a908d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 20 20:46:19 2018 +0000 tests: Automatically detect Rust crates to test and also pass --verbose. * FIXES #25560: https://bugs.torproject.org/25560. --- changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/changes/bug25560 b/changes/bug25560 new file mode 100644 index 000000000..5947fa03a --- /dev/null +++ b/changes/bug25560 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, rust): + - Some of our Rust crates were not having their tests run with `make + test-rust` due to a static string in the `src/test/test_rust.sh` script + specifying which crates to test. Rust crates are not automatically + detected and tested. Fixes bug 25560; bugfix on 0.3.3.3-alpha. diff --git a/src/test/include.am b/src/test/include.am index 1a49367c6..b768f7447 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -360,4 +360,4 @@ EXTRA_DIST += \ src/test/test_workqueue_socketpair.sh test-rust: - $(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh + $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh" diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 133f2bb94..d87336e70 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -1,20 +1,15 @@ #!/bin/sh # Test all Rust crates -crates="protover tor_util smartlist tor_allocate" - -exitcode=0 - set -e -for crate in $crates; do - cd "${abs_top_builddir:-../../..}/src/rust" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ - || exitcode=1 - cd - -done +CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + find "${abs_top_srcdir:-../../..}/src/rust" \ + -mindepth 2 -maxdepth 2 \ + -type f -name 'Cargo.toml' \ + -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path '{}' \; + +exit $? -exit $exitcode

1 0

[tor/master] Merge branch 'bug25560_rebased_033' into maint-0.3.3
by nickm＠torproject.org 23 Mar '18

23 Mar '18

commit 79d3f401a5c87a61ca153af207039158db5f7874 Merge: 2b3138741 657d5cbbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:18:20 2018 -0400 Merge branch 'bug25560_rebased_033' into maint-0.3.3 changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-)

1 0