diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:30:09 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:30:09 +0200 |
| commit | e1718c2dc09666f4db65b64964ef14580e45a5a8 (patch) | |
| tree | 8118ce11ba80188ddd8e66a19d91907ed7fcd1a7 | |
| parent | 698984c18003cca9f7763561ac479c3d5849426a (diff) | |
| parent | a5130de43297373ec93c3623689e42cc1384b3f9 (diff) | |
| download | tor-e1718c2dc09666f4db65b64964ef14580e45a5a8.tar.gz tor-e1718c2dc09666f4db65b64964ef14580e45a5a8.zip | |
Merge branch 'maint-0.3.0' into release-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..95c8f6c336 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. This is Tue, 13 Dec 2016 09:37:14 GMT + update_approx_time(1481621834); + MOCK(entry_guard_is_listed, mock_entry_guard_is_listed); dummy_state = state; |