]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "test-dhcp-client: add temporary workaround for assertion failure" 29013/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 30 Aug 2023 08:26:57 +0000 (17:26 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 30 Aug 2023 08:37:22 +0000 (17:37 +0900)
This reverts commit 1686c884bfa846f8da87621e87870eb18dd8107c.

The issue should be fixed by the previous commit. Let's drop the
workaround.

src/libsystemd-network/test-dhcp-client.c

index 8c16d65bbc8d3254ec8685b8b13cd16989c2f3ab..f3f558a358513edb01f89e30f53fe30adcf0eecb 100644 (file)
@@ -522,9 +522,7 @@ static void test_addr_acq(sd_event *e) {
         res = sd_dhcp_client_start(client);
         assert_se(IN_SET(res, 0, -EINPROGRESS));
 
-        r = sd_event_loop(e);
-        /* Times out since https://github.com/systemd/systemd/issues/28990 add workaorund for now */
-        assert_se(r >= 0 || r == -ETIMEDOUT);
+        assert_se(sd_event_loop(e) >= 0);
 
         assert_se(sd_dhcp_client_set_callback(client, NULL, NULL) >= 0);
         assert_se(sd_dhcp_client_stop(client) >= 0);