From e660d66e1ca1304774229aafceb579a9e7ae401d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 12 Oct 2021 03:02:41 +0900 Subject: [PATCH 1/2] test: add more node enumerator tests --- src/libsystemd/sd-bus/test-bus-objects.c | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index a71add4342..6c8d5db693 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -219,6 +219,19 @@ static int enumerator2_callback(sd_bus *bus, const char *path, void *userdata, c return 1; } +static int enumerator3_callback(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { + _cleanup_strv_free_ char **v = NULL; + + if (!object_path_startswith("/value/b", path)) + return 1; + + for (unsigned i = 0; i < 30; i++) + assert_se(strv_extendf(&v, "/value/b/%u", i) >= 0); + + *nodes = TAKE_PTR(v); + return 1; +} + static void *server(void *p) { struct context *c = p; sd_bus *bus = NULL; @@ -238,6 +251,7 @@ static void *server(void *p) { assert_se(sd_bus_add_fallback_vtable(bus, NULL, "/value", "org.freedesktop.systemd.ValueTest", vtable2, NULL, UINT_TO_PTR(20)) >= 0); assert_se(sd_bus_add_node_enumerator(bus, NULL, "/value", enumerator_callback, NULL) >= 0); assert_se(sd_bus_add_node_enumerator(bus, NULL, "/value/a", enumerator2_callback, NULL) >= 0); + assert_se(sd_bus_add_node_enumerator(bus, NULL, "/value/b", enumerator3_callback, NULL) >= 0); assert_se(sd_bus_add_object_manager(bus, NULL, "/value") >= 0); assert_se(sd_bus_add_object_manager(bus, NULL, "/value/a") >= 0); @@ -280,6 +294,7 @@ static int client(struct context *c) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_strv_free_ char **lines = NULL; const char *s; int r; @@ -400,6 +415,30 @@ static int client(struct context *c) { assert_se(r >= 0); fputs(s, stdout); + assert_se(lines = strv_split_newlines(s)); + assert_se(strv_contains(lines, " ")); + assert_se(strv_contains(lines, " ")); + assert_se(strv_contains(lines, " ")); + lines = strv_free(lines); + + reply = sd_bus_message_unref(reply); + + r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/value/b", "org.freedesktop.DBus.Introspectable", "Introspect", &error, &reply, NULL); + assert_se(r >= 0); + + r = sd_bus_message_read(reply, "s", &s); + assert_se(r >= 0); + fputs(s, stdout); + + assert_se(lines = strv_split_newlines(s)); + for (unsigned i = 0; i < 30; i++) { + _cleanup_free_ char *n = NULL; + + assert_se(asprintf(&n, " ", i) >= 0); + assert_se(strv_contains(lines, n)); + } + lines = strv_free(lines); + reply = sd_bus_message_unref(reply); r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/foo", "org.freedesktop.DBus.Properties", "GetAll", &error, &reply, "s", NULL); From 16614bebd82ff29877281d4a566e2bf42d13910f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 12 Oct 2021 03:04:06 +0900 Subject: [PATCH 2/2] test: shorten code a bit --- src/busctl/test-busctl-introspect.c | 46 +++-------------------------- 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/src/busctl/test-busctl-introspect.c b/src/busctl/test-busctl-introspect.c index 862a92a0e2..216a9a3c3b 100644 --- a/src/busctl/test-busctl-introspect.c +++ b/src/busctl/test-busctl-introspect.c @@ -354,48 +354,10 @@ static void test_introspect_on_path(void) { assert_se(strv_extend(&expected, "/org/freedesktop/LogControl1") >= 0); assert_se(strv_extend(&expected, "/org/freedesktop/network1") >= 0); assert_se(strv_extend(&expected, "/org/freedesktop/network1/network") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/0") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/0/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/1") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/1/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/2") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/2/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/3") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/3/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/4") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/4/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/5") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/5/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/6") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/6/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/7") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/7/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/8") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/8/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/9") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/9/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/10") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/10/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/11") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/11/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/12") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/12/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/13") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/13/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/14") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/14/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/15") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/15/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/16") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/16/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/17") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/17/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/18") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/18/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/19") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/19/hoge") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/20") >= 0); - assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/20/hoge") >= 0); + for (unsigned i = 0; i <= 20; i++) { + assert_se(strv_extendf(&expected, "/org/freedesktop/network1/network/%u", i) >= 0); + assert_se(strv_extendf(&expected, "/org/freedesktop/network1/network/%u/hoge", i) >= 0); + } strv_sort(expected); assert_se(strv_equal(l, expected));