torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'meejah/ticket-21329-onions-current'

Browse Source
This commit is contained in:
Nick Mathewson
2017-02-16 09:40:56 -05:00
parent 832d4636f5 fc58c37e33
commit 31be66ea5a
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_controller.c
+39
View File
@@ -108,6 +108,44 @@ test_add_onion_helper_keyarg(void *arg)
tor_free(arg_str);
}
static void
test_getinfo_helper_onion(void *arg)
{
(void)arg;
control_connection_t dummy;
/* Get results out */
char *answer = NULL;
const char *errmsg = NULL;
char *service_id = NULL;
int rt = 0;
dummy.ephemeral_onion_services = NULL;
/* successfully get an empty answer */
rt = getinfo_helper_onions(&dummy, "onions/current", &answer, &errmsg);
tt_assert(rt == 0);
tt_str_op(answer, OP_EQ, "");
tor_free(answer);
/* successfully get an empty answer */
rt = getinfo_helper_onions(&dummy, "onions/detached", &answer, &errmsg);
tt_assert(rt == 0);
tt_str_op(answer, OP_EQ, "");
tor_free(answer);
/* get an answer for one onion service */
service_id = tor_strdup("dummy_onion_id");
dummy.ephemeral_onion_services = smartlist_new();
smartlist_add(dummy.ephemeral_onion_services, service_id);
rt = getinfo_helper_onions(&dummy, "onions/current", &answer, &errmsg);
tt_assert(rt == 0);
tt_str_op(answer, OP_EQ, "dummy_onion_id");
done:
tor_free(answer);
tor_free(service_id);
}
static void
test_rend_service_parse_port_config(void *arg)
{
@@ -1332,6 +1370,7 @@ test_download_status_bridge(void *arg)
struct testcase_t controller_tests[] = {
{ "add_onion_helper_keyarg", test_add_onion_helper_keyarg, 0, NULL, NULL },
{ "getinfo_helper_onion", test_getinfo_helper_onion, 0, NULL, NULL },
{ "rend_service_parse_port_config", test_rend_service_parse_port_config, 0,
NULL, NULL },
{ "add_onion_helper_clientauth", test_add_onion_helper_clientauth, 0, NULL,