diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:30:45 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-26 12:30:45 +0200 |
| commit | 0895808023b023a8eff00c6b6eb27c4ec4b40191 (patch) | |
| tree | cf9da507ffb68a697d82ab50ad784cd80673ea95 | |
| parent | 801530f7ca3818cd2cd9d31324841c91427b5bd4 (diff) | |
| parent | a5130de43297373ec93c3623689e42cc1384b3f9 (diff) | |
| download | tor-0895808023b023a8eff00c6b6eb27c4ec4b40191.tar.gz tor-0895808023b023a8eff00c6b6eb27c4ec4b40191.zip | |
Merge remote-tracking branch 'origin/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 b2600c8748..3db7e63ee3 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; |