File 0006-test-add-test-for-prefix-unit-loading.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-test-add-test-for-prefix-unit-loading.patch of Package systemd (Revision 2a0ef622b860d89b09df9bc0f43c3432)

Currently displaying revision 2a0ef622b860d89b09df9bc0f43c3432 , Show latest

From 1f766f1cbe3f7e08c126ace1a9b80c4d307d950d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Mar 2018 19:55:54 +0100
Subject: [PATCH 06/11] test: add test for prefix unit loading

(cherry picked from commit 7ce49e656b1377713ade999dfe381807a78313cd)

[fbui: adjust context:
      	src/test/test-engine.c
      	test/meson.build]
---
 src/test/test-engine.c                                    | 11 ++++++++++-
 test/meson.build                                          |  6 ++++++
 test/unit-.service.d/10-override.conf                     |  2 ++
 test/unit-with-.service.d/20-override.conf                |  2 ++
 test/unit-with-multiple-.service.d/20-override.conf       |  2 ++
 test/unit-with-multiple-.service.d/30-override.conf       |  2 ++
 test/unit-with-multiple-dashes.service                    |  6 ++++++
 test/unit-with-multiple-dashes.service.d/10-override.conf |  2 ++
 8 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/unit-.service.d/10-override.conf
 create mode 100644 test/unit-with-.service.d/20-override.conf
 create mode 100644 test/unit-with-multiple-.service.d/20-override.conf
 create mode 100644 test/unit-with-multiple-.service.d/30-override.conf
 create mode 100644 test/unit-with-multiple-dashes.service
 create mode 100644 test/unit-with-multiple-dashes.service.d/10-override.conf

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 06e15acc43..85f5fd6c46 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -31,12 +31,16 @@ int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error err = SD_BUS_ERROR_NULL;
         Manager *m = NULL;
-        Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL, *h = NULL;
+        Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL, *h = NULL, *unit_with_multiple_dashes = NULL;
         FILE *serial = NULL;
         FDSet *fdset = NULL;
         Job *j;
         int r;
 
+        log_set_max_level(LOG_DEBUG);
+        log_parse_environment();
+        log_open();
+
         r = enter_cgroup_subroot();
         if (r == -ENOMEDIUM) {
                 log_notice_errno(r, "Skipping test: cgroupfs not available");
@@ -117,5 +121,10 @@ int main(int argc, char *argv[]) {
 
         manager_free(m);
 
+        assert_se(manager_load_unit(m, "unit-with-multiple-dashes.service", NULL, NULL, &unit_with_multiple_dashes) >= 0);
+
+        assert_se(strv_equal(unit_with_multiple_dashes->documentation, STRV_MAKE("man:test", "man:override2", "man:override3")));
+        assert_se(streq_ptr(unit_with_multiple_dashes->description, "override4"));
+
         return 0;
 }
diff --git a/test/meson.build b/test/meson.build
index 55e693ac72..5489a95df8 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -136,6 +136,12 @@ test_data_files = '''
         hwdb/10-bad.hwdb
         journal-data/journal-1.txt
         journal-data/journal-2.txt
+        unit-with-.service.d/20-override.conf
+        unit-with-multiple-.service.d/20-override.conf
+        unit-with-multiple-.service.d/30-override.conf
+        unit-with-multiple-dashes.service
+        unit-with-multiple-dashes.service.d/10-override.conf
+        unstoppable.service
 '''.split()
 
 if conf.get('ENABLE_RESOLVED', false)
diff --git a/test/unit-.service.d/10-override.conf b/test/unit-.service.d/10-override.conf
new file mode 100644
index 0000000000..916737d415
--- /dev/null
+++ b/test/unit-.service.d/10-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Description=override0
diff --git a/test/unit-with-.service.d/20-override.conf b/test/unit-with-.service.d/20-override.conf
new file mode 100644
index 0000000000..c6c2438f73
--- /dev/null
+++ b/test/unit-with-.service.d/20-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Documentation=man:override1
diff --git a/test/unit-with-multiple-.service.d/20-override.conf b/test/unit-with-multiple-.service.d/20-override.conf
new file mode 100644
index 0000000000..62fafd2e3b
--- /dev/null
+++ b/test/unit-with-multiple-.service.d/20-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Documentation=man:override2
diff --git a/test/unit-with-multiple-.service.d/30-override.conf b/test/unit-with-multiple-.service.d/30-override.conf
new file mode 100644
index 0000000000..b9616da8a8
--- /dev/null
+++ b/test/unit-with-multiple-.service.d/30-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Documentation=man:override3
diff --git a/test/unit-with-multiple-dashes.service b/test/unit-with-multiple-dashes.service
new file mode 100644
index 0000000000..b38b3604b8
--- /dev/null
+++ b/test/unit-with-multiple-dashes.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=A unit with multiple dashes
+Documentation=man:test
+
+[Service]
+ExecStart=/bin/true
diff --git a/test/unit-with-multiple-dashes.service.d/10-override.conf b/test/unit-with-multiple-dashes.service.d/10-override.conf
new file mode 100644
index 0000000000..982c3621a6
--- /dev/null
+++ b/test/unit-with-multiple-dashes.service.d/10-override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Description=override4
-- 
2.16.4

Places

File 0006-test-add-test-for-prefix-unit-loading.patch of Package systemd (Revision 2a0ef622b860d89b09df9bc0f43c3432)

Places