nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose fake channel utility functions in test suite in fakechans.h, and fix a test_channel.c bug

Browse Source
This commit is contained in:
Andrea Shepard 2014-01-21 00:46:57 -08:00
parent ba294ff2dc
commit 79b8f14c25
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/fakechans.h Normal file
View File

@ -0,0 +1,16 @@
/* Copyright (c) 2014, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#ifndef TOR_FAKECHANS_H
#define TOR_FAKECHANS_H
/**
* \file fakechans.h
* \brief Declarations for fake channels for test suite use
*/
void make_fake_cell(cell_t *c);
void make_fake_var_cell(var_cell_t *c);
channel_t * new_fake_channel(void);
#endif /* !defined(TOR_FAKECHANS_H) */

35
src/test/test_channel.c
View File

@ -13,7 +13,10 @@
#include "relay.h" #include "relay.h"
/* For init/free stuff */ /* For init/free stuff */
#include "scheduler.h" #include "scheduler.h"
/* Test suite stuff */
#include "test.h" #include "test.h"
#include "fakechans.h"
static int test_chan_accept_cells = 0; static int test_chan_accept_cells = 0;
static int test_cells_written = 0; static int test_cells_written = 0;
@ -31,9 +34,6 @@ static int chan_test_write_cell(channel_t *ch, cell_t *cell);
static int chan_test_write_packed_cell(channel_t *ch, static int chan_test_write_packed_cell(channel_t *ch,
packed_cell_t *packed_cell); packed_cell_t *packed_cell);
static int chan_test_write_var_cell(channel_t *ch, var_cell_t *var_cell); static int chan_test_write_var_cell(channel_t *ch, var_cell_t *var_cell);
static void make_fake_cell(cell_t *c);
static void make_fake_var_cell(var_cell_t *c);
static channel_t * new_fake_channel(void);
static void scheduler_channel_doesnt_want_writes_mock(channel_t *ch); static void scheduler_channel_doesnt_want_writes_mock(channel_t *ch);
static void scheduler_release_channel_mock(channel_t *ch); static void scheduler_release_channel_mock(channel_t *ch);
@ -150,7 +150,11 @@ chan_test_write_var_cell(channel_t *ch, var_cell_t *var_cell)
return rv; return rv;
} }
static void /**
* Fill out c with a new fake cell for test suite use
*/
void
make_fake_cell(cell_t *c) make_fake_cell(cell_t *c)
{ {
test_assert(c != NULL); test_assert(c != NULL);
@ -163,7 +167,11 @@ make_fake_cell(cell_t *c)
return; return;
} }
static void /**
* Fill out c with a new fake var_cell for test suite use
*/
void
make_fake_var_cell(var_cell_t *c) make_fake_var_cell(var_cell_t *c)
{ {
test_assert(c != NULL); test_assert(c != NULL);
@ -177,7 +185,11 @@ make_fake_var_cell(var_cell_t *c)
return; return;
} }
static channel_t * /**
* Set up a new fake channel for the test suite
*/
channel_t *
new_fake_channel(void) new_fake_channel(void)
{ {
channel_t *chan = tor_malloc_zero(sizeof(channel_t)); channel_t *chan = tor_malloc_zero(sizeof(channel_t));
@ -492,6 +504,17 @@ test_channel_multi(void *arg)
global_queue_estimate = channel_get_global_queue_estimate(); global_queue_estimate = channel_get_global_queue_estimate();
test_eq(global_queue_estimate, 512); test_eq(global_queue_estimate, 512);
/*
* Since the fake channels aren't registered, channel_free_all() can't
* see them properly.
*/
MOCK(scheduler_release_channel, scheduler_release_channel_mock);
channel_mark_for_close(ch1);
UNMOCK(scheduler_release_channel);
global_queue_estimate = channel_get_global_queue_estimate();
test_eq(global_queue_estimate, 0);
/* Now free everything */ /* Now free everything */
MOCK(scheduler_release_channel, scheduler_release_channel_mock); MOCK(scheduler_release_channel, scheduler_release_channel_mock);
channel_free_all(); channel_free_all();