From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Sep 2016 19:25:56 +0000 (-0400)
Subject: Fix remaining test warnings. (in test_relay.c)
X-Git-Tag: tor-0.2.9.3-alpha~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d860b99dbf9f86aa27d7e7fcf161d2b16d838c68;p=thirdparty%2Ftor.git

Fix remaining test warnings. (in test_relay.c)
---

diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index a7fcad5401..29016e444b 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -74,6 +74,10 @@ test_relay_append_cell_to_circuit_queue(void *arg)
   /* Make a fake orcirc */
   orcirc = new_fake_orcirc(nchan, pchan);
   tt_assert(orcirc);
+  circuitmux_attach_circuit(nchan->cmux, TO_CIRCUIT(orcirc),
+                            CELL_DIRECTION_OUT);
+  circuitmux_attach_circuit(pchan->cmux, TO_CIRCUIT(orcirc),
+                            CELL_DIRECTION_IN);
 
   /* Make a cell */
   cell = tor_malloc_zero(sizeof(cell_t));
@@ -111,6 +115,10 @@ test_relay_append_cell_to_circuit_queue(void *arg)
   tor_free(cell);
   cell_queue_clear(&orcirc->base_.n_chan_cells);
   cell_queue_clear(&orcirc->p_chan_cells);
+  if (orcirc) {
+    circuitmux_detach_circuit(nchan->cmux, TO_CIRCUIT(orcirc));
+    circuitmux_detach_circuit(pchan->cmux, TO_CIRCUIT(orcirc));
+  }
   tor_free(orcirc);
   free_fake_channel(nchan);
   free_fake_channel(pchan);