From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 9 Oct 2018 13:53:13 +0000 (+0900)
Subject: test: make test-sd-device stricter
X-Git-Tag: v240~545^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10327%2Fhead;p=thirdparty%2Fsystemd.git

test: make test-sd-device stricter
---

diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c
index 6f4f2e1c6fd..e2701e0e242 100644
--- a/src/libsystemd/sd-device/test-sd-device.c
+++ b/src/libsystemd/sd-device/test-sd-device.c
@@ -113,13 +113,7 @@ static void test_sd_device_enumerator_filter_subsystem(void) {
                         assert_se(hashmap_put(subsystems, str, h) >= 0);
                 }
 
-                r = hashmap_put(h, syspath, d);
-                assert_se(r >= 0 || r == -EEXIST);
-                if (r < 0) {
-                        log_info("Duplicated subsystem:%s syspath:%s", subsystem, syspath);
-                        continue;
-                }
-
+                assert_se(hashmap_put(h, syspath, d) >= 0);
                 assert_se(sd_device_ref(d));
 
                 log_debug("Added subsystem:%s syspath:%s", subsystem, syspath);