aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_pubsub_build.c
diff options
context:
space:
mode:
authorTaylor Yu <catalyst@torproject.org>2019-04-01 14:53:39 -0500
committerTaylor Yu <catalyst@torproject.org>2019-05-22 16:33:19 -0500
commita8a0144d1183a3598bffe6c552507c9dcbdcd474 (patch)
tree73bfd222df04d196d973e4f9049760dff0561cd8 /src/test/test_pubsub_build.c
parentfa410162a3309dba31661f7f22c95bbdc3af66a5 (diff)
downloadtor-a8a0144d1183a3598bffe6c552507c9dcbdcd474.tar.gz
tor-a8a0144d1183a3598bffe6c552507c9dcbdcd474.zip
Multiple subscribers or publishers per subsystem
Allow a subsystem to register to publish or subscribe a given message from multiple places. Part of ticket 29976.
Diffstat (limited to 'src/test/test_pubsub_build.c')
-rw-r--r--src/test/test_pubsub_build.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/src/test/test_pubsub_build.c b/src/test/test_pubsub_build.c
index ce5bf60080..021323fbf1 100644
--- a/src/test/test_pubsub_build.c
+++ b/src/test/test_pubsub_build.c
@@ -493,48 +493,6 @@ test_pubsub_build_sub_many(void *arg)
tor_free(sysname);
}
-/* The same subsystem can only declare one publish or subscribe. */
-static void
-test_pubsub_build_pubsub_redundant(void *arg)
-{
- (void)arg;
- pubsub_builder_t *b = NULL;
- dispatch_t *dispatcher = NULL;
- pubsub_connector_t *c = NULL;
-
- b = pubsub_builder_new();
- seed_pubsub_builder_basic(b);
- pub_binding_t btmp;
-
- {
- c = pubsub_connector_for_subsystem(b, get_subsys_id("sys2"));
- DISPATCH_ADD_SUB(c, main, bunch_of_coconuts);
- pubsub_add_pub_(c, &btmp, get_channel_id("main"),
- get_message_id("yes_we_have_no"),
- get_msg_type_id("string"),
- 0 /* flags */,
- "somewhere.c", 22);
- pubsub_connector_free(c);
- };
-
- setup_full_capture_of_logs(LOG_WARN);
- dispatcher = pubsub_builder_finalize(b, NULL);
- b = NULL;
- tt_assert(dispatcher == NULL);
-
- expect_log_msg_containing(
- "Message \"yes_we_have_no\" is configured to be published by "
- "subsystem \"sys2\" more than once.");
- expect_log_msg_containing(
- "Message \"bunch_of_coconuts\" is configured to be subscribed by "
- "subsystem \"sys2\" more than once.");
-
- done:
- pubsub_builder_free(b);
- dispatch_free(dispatcher);
- teardown_capture_of_logs();
-}
-
/* It's fine to declare the excl flag. */
static void
test_pubsub_build_excl_ok(void *arg)
@@ -614,7 +572,6 @@ struct testcase_t pubsub_build_tests[] = {
T(pubsub_same, TT_FORK),
T(pubsub_multi, TT_FORK),
T(sub_many, TT_FORK),
- T(pubsub_redundant, TT_FORK),
T(excl_ok, TT_FORK),
T(excl_bad, TT_FORK),
END_OF_TESTCASES