diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:28:58 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:28:58 +0200 |
| commit | 47f587c4ca801c7e8aa469c9d4110c8c1f638de5 (patch) | |
| tree | 7a7e5d4617850920a92c818ba8b4d4d9684ea82e | |
| parent | 567a56ae2e59aef26b31829f300c5700c7923f7b (diff) | |
| parent | 4f6025498dde54761967d00801616f33cf69f71c (diff) | |
| download | tor-47f587c4ca801c7e8aa469c9d4110c8c1f638de5.tar.gz tor-47f587c4ca801c7e8aa469c9d4110c8c1f638de5.zip | |
Merge branch 'ticket21799' into maint-0.3.0
| -rw-r--r-- | changes/bug21799 | 6 | ||||
| -rw-r--r-- | src/test/test_entrynodes.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug21799 b/changes/bug21799 new file mode 100644 index 0000000000..ee2e904a35 --- /dev/null +++ b/changes/bug21799 @@ -0,0 +1,6 @@ + o Minor bugfixes (tests): + - Run the entry_guard_parse_from_state_full test with the time set + to a specific date. (The guard state that this test was parsing + contained guards that had expired since the test was first + written.) Fixes bug 21799; bugfix on 0.3.0.1-alpha. + diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 249fd1f973..602aee9af3 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -584,6 +584,9 @@ test_entry_guard_parse_from_state_full(void *arg) smartlist_t *text = smartlist_new(); char *joined = NULL; + // So nodes aren't expired + update_approx_time(1481621834); + MOCK(entry_guard_is_listed, mock_entry_guard_is_listed); dummy_state = state; |