aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_dir.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-05 19:49:45 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-05 19:49:45 -0500
commita7a0cebb59d3956a43ed65c22b15f60007b16f77 (patch)
treecbbd970c1d10ca4e95c41346a7a0afaed677a210 /src/test/test_dir.c
parente8a6a6635b26c327beca4f2a91c7ec2b2ff03cd8 (diff)
parent46f167886a44bef90021fb54e4687200cdd8b5a2 (diff)
downloadtor-a7a0cebb59d3956a43ed65c22b15f60007b16f77.tar.gz
tor-a7a0cebb59d3956a43ed65c22b15f60007b16f77.zip
Merge branch 'more_directories_squashed'
Diffstat (limited to 'src/test/test_dir.c')
-rw-r--r--src/test/test_dir.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index ee4a9780b1..83734ccfd9 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -4874,9 +4874,11 @@ mock_check_private_dir(const char *dirname, cpd_check_t check,
static char *
mock_get_datadir_fname(const or_options_t *options,
+ directory_root_t roottype,
const char *sub1, const char *sub2,
const char *suffix)
{
+ (void) roottype;
char *rv = NULL;
/*
@@ -5033,7 +5035,7 @@ test_dir_dump_unparseable_descriptors(void *data)
mock_options->MaxUnparseableDescSizeToLog = 1536;
MOCK(get_options, mock_get_options);
MOCK(check_private_dir, mock_check_private_dir);
- MOCK(options_get_datadir_fname2_suffix,
+ MOCK(options_get_dir_fname2_suffix,
mock_get_datadir_fname);
/*
@@ -5551,7 +5553,7 @@ test_dir_dump_unparseable_descriptors(void *data)
mock_unlink_reset();
UNMOCK(write_str_to_file);
mock_write_str_to_file_reset();
- UNMOCK(options_get_datadir_fname2_suffix);
+ UNMOCK(options_get_dir_fname2_suffix);
UNMOCK(check_private_dir);
UNMOCK(get_options);
tor_free(mock_options);