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

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 72484a4953d744754b3b6b025242ef668e3f017a Merge: aeafb7f44f f9bb49d870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:27 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 7915b651d9e926d829d2241a161c7afdaf0e7ffb Merge: 34919368ce 45d9830493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 72484a4953d744754b3b6b025242ef668e3f017a Merge: aeafb7f44f f9bb49d870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:27 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit ef18fb56c95c7761017eb8bb36a97415d7bb82ce Merge: 26b257757b 7915b651d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 8669ace2fb4159b8782d181894a5e53125444ed4 Merge: e82f36bccc ef18fb56c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.4' changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 72484a4953d744754b3b6b025242ef668e3f017a Merge: aeafb7f44f f9bb49d870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:27 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 45d983049382e09d14d5047f9eef941d089e9fb7 Merge: 07f0210a05 72484a4953 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 7915b651d9e926d829d2241a161c7afdaf0e7ffb Merge: 34919368ce 45d9830493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit ee72c517b2cce9df02000c7c456cea07e3d2f158 Merge: d605622ade 72484a4953 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Fix allocation counting in clean_v2_descs_as_dir test.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit f9bb49d870045fa6e1a2570a65f0583066d8359d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 14:25:46 2020 -0400 Fix allocation counting in clean_v2_descs_as_dir test. Without this fix, running this test on its own would fail. Fixes bug 40099. Bugfix on ade5005853c17b3 in 0.2.8.1-alpha. --- changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40099 b/changes/bug40099 new file mode 100644 index 0000000000..278ede2023 --- /dev/null +++ b/changes/bug40099 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Fix the behavior of the rend_cache/clean_v2_descs_as_dir when run on + its own. Previously, it would exit with an error. + Fixes bug 40099; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 4f544cf21c..93f9f82953 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1101,6 +1101,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data) desc->timestamp = now; desc->pk = pk_generate(0); e->parsed = desc; + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); digestmap_set(rend_cache_v2_dir, key, e); /* Set the cutoff to minus 10 seconds. */ @@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = { test_rend_cache_validate_intro_point_failure, 0, NULL, NULL }, END_OF_TESTCASES }; -

1 0