X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-namespace.c;h=5b76b9e73ffddaaafe2f3a4f9dc6a4db885a838b;hb=f937d3d662ffd66416bb8b949ea59331dd9b2172;hp=6454a1bd6e374fc1668fb3295c50a335c82ea8cc;hpb=613b411c947635136637f8cdd66b94512f761eab;p=elogind.git

diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 6454a1bd6..5b76b9e73 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -119,13 +119,25 @@ static void test_netns(void) {
 }
 
 int main(int argc, char *argv[]) {
-        test_tmpdir("abcd.service",
-                    "/tmp/systemd-abcd.service-",
-                    "/var/tmp/systemd-abcd.service-");
+        sd_id128_t bid;
+        char boot_id[SD_ID128_STRING_MAX];
+        _cleanup_free_ char *x = NULL, *y = NULL, *z = NULL, *zz = NULL;
 
-        test_tmpdir("sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device",
-                    "/tmp/systemd-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-",
-                    "/var/tmp/systemd-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-");
+        assert_se(sd_id128_get_boot(&bid) >= 0);
+        sd_id128_to_string(bid, boot_id);
+
+        x = strjoin("/tmp/systemd-private-", boot_id, "-abcd.service-", NULL);
+        y = strjoin("/var/tmp/systemd-private-", boot_id, "-abcd.service-", NULL);
+        assert_se(x && y);
+
+        test_tmpdir("abcd.service", x, y);
+
+        z = strjoin("/tmp/systemd-private-", boot_id, "-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-", NULL);
+        zz = strjoin("/var/tmp/systemd-private-", boot_id, "-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-", NULL);
+
+        assert_se(z && zz);
+
+        test_tmpdir("sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device", z, zz);
 
         test_netns();