Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4

2 files changed, 3 insertions, 5 deletions

diff --git a/src/test/test.h b/src/test/test.h
index 3095d54e33..63b2b30746 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -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
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index c4a4cacd98..c44f791e0d 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -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;