nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make things mockable for dump_desc_populate_fifo_from_directory() unit test

Browse Source
This commit is contained in:
Andrea Shepard 2016-06-30 06:27:14 +00:00
parent 42f089473a
commit f99c9df02b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/util.c
View File

@ -3412,8 +3412,8 @@ smartlist_add_vasprintf(struct smartlist_t *sl, const char *pattern,
/** Return a new list containing the filenames in the directory <b>dirname</b>. /** Return a new list containing the filenames in the directory <b>dirname</b>.
* Return NULL on error or if <b>dirname</b> is not a directory. * Return NULL on error or if <b>dirname</b> is not a directory.
*/ */
smartlist_t * MOCK_IMPL(smartlist_t *,
tor_listdir(const char *dirname) tor_listdir, (const char *dirname))
{ {
smartlist_t *result; smartlist_t *result;
#ifdef _WIN32 #ifdef _WIN32

2
src/common/util.h
View File

@ -377,7 +377,7 @@ const char *parse_config_line_from_str_verbose(const char *line,
char **key_out, char **value_out, char **key_out, char **value_out,
const char **err_out); const char **err_out);
char *expand_filename(const char *filename); char *expand_filename(const char *filename);
struct smartlist_t *tor_listdir(const char *dirname); MOCK_DECL(struct smartlist_t *, tor_listdir, (const char *dirname));
int path_is_relative(const char *filename); int path_is_relative(const char *filename);
/* Process helpers */ /* Process helpers */

4
src/or/routerparse.c
View File

@ -823,8 +823,8 @@ dump_desc_fifo_cleanup(void)
* the filename is sensibly formed and matches the file content, and either * the filename is sensibly formed and matches the file content, and either
* return a dumped_desc_t for it or remove the file and return NULL. * return a dumped_desc_t for it or remove the file and return NULL.
*/ */
STATIC dumped_desc_t * MOCK_IMPL(STATIC dumped_desc_t *,
dump_desc_populate_one_file(const char *dirname, const char *f) dump_desc_populate_one_file, (const char *dirname, const char *f))
{ {
dumped_desc_t *ent = NULL; dumped_desc_t *ent = NULL;
char *path = NULL, *desc = NULL; char *path = NULL, *desc = NULL;

4
src/or/routerparse.h
View File

@ -107,8 +107,8 @@ STATIC int routerstatus_parse_guardfraction(const char *guardfraction_str,
networkstatus_t *vote, networkstatus_t *vote,
vote_routerstatus_t *vote_rs, vote_routerstatus_t *vote_rs,
routerstatus_t *rs); routerstatus_t *rs);
STATIC dumped_desc_t * dump_desc_populate_one_file(const char *dirname, MOCK_DECL(STATIC dumped_desc_t *, dump_desc_populate_one_file,
const char *f); (const char *dirname, const char *f));
STATIC void dump_desc(const char *desc, const char *type); STATIC void dump_desc(const char *desc, const char *type);
STATIC void dump_desc_fifo_cleanup(void); STATIC void dump_desc_fifo_cleanup(void);
#endif #endif