diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-13 14:20:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-13 14:20:39 -0400 |
| commit | 45d983049382e09d14d5047f9eef941d089e9fb7 (patch) | |
| tree | af15fd4854501b6f74a86aa12b93d7c0be7ed487 | |
| parent | 07f0210a0525423f8cbbb41d00df0aa2d40fedf5 (diff) | |
| parent | 72484a4953d744754b3b6b025242ef668e3f017a (diff) | |
| download | tor-maint-0.4.2.tar.gz tor-maint-0.4.2.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2maint-0.4.2
| -rw-r--r-- | changes/bug40099 | 4 | ||||
| -rw-r--r-- | src/test/test_rendcache.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 }; - |