torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson
2018-06-20 07:53:22 -04:00
parent 152e4a1e50 38cb638c32
commit 5acbcf150e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test.h
+2
View File
@@ -11,6 +11,8 @@
* \brief Macros and functions used by unit tests.
*/
#define DEBUG_SMARTLIST 1
#include "compat.h"
#include "tinytest.h"
#define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END
src/test/test_bridges.c
+1 -5
View File
@@ -140,7 +140,6 @@ test_bridges_clear_bridge_list(void *arg)
const smartlist_t *bridgelist;
const smartlist_t *bridgelist_after;
const bridge_info_t *bridge;
const bridge_info_t *bridge_after;
helper_add_bridges_to_bridgelist(arg);
bridgelist = bridge_list_get();
@@ -152,10 +151,7 @@ test_bridges_clear_bridge_list(void *arg)
clear_bridge_list();
bridgelist_after = bridge_list_get();
tt_ptr_op(bridgelist_after, OP_NE, NULL);
bridge_after = smartlist_get(bridgelist, 0);
// There now shouldn't be a first bridge
tt_ptr_op(bridge_after, OP_EQ, NULL);
tt_int_op(smartlist_len(bridgelist_after), OP_EQ, 0);
done:
return;