test: update test-engine.c to work again

diff --git a/src/test-engine.c b/src/test-engine.c
index 27e16f34848d54c476ef27d47448d41742be73e4..eb17f580e2b5b728bca6d8d93e422dfd9b48016e 100644 (file)
--- a/src/test-engine.c
+++ b/src/test-engine.c
@@ -36,9 +36,9 @@ int main(int argc, char *argv[]) {
         assert_se(manager_new(MANAGER_INIT, false, &m) >= 0);
 
         printf("Load1:\n");
-        assert_se(manager_load_unit(m, "a.service", NULL, &a) == 0);
-        assert_se(manager_load_unit(m, "b.service", NULL, &b) == 0);
-        assert_se(manager_load_unit(m, "c.service", NULL, &c) == 0);
+        assert_se(manager_load_unit(m, "a.service", NULL, &a) >= 0);
+        assert_se(manager_load_unit(m, "b.service", NULL, &b) >= 0);
+        assert_se(manager_load_unit(m, "c.service", NULL, &c) >= 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test1: (Trivial)\n");
@@ -47,8 +47,8 @@ int main(int argc, char *argv[]) {
 
         printf("Load2:\n");
         manager_clear_jobs(m);
-        assert_se(manager_load_unit(m, "d.service", NULL, &d) == 0);
-        assert_se(manager_load_unit(m, "e.service", NULL, &e) == 0);
+        assert_se(manager_load_unit(m, "d.service", NULL, &d) >= 0);
+        assert_se(manager_load_unit(m, "e.service", NULL, &e) >= 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test2: (Cyclic Order, Unfixable)\n");
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load3:\n");
-        assert_se(manager_load_unit(m, "g.service", NULL, &g) == 0);
+        assert_se(manager_load_unit(m, "g.service", NULL, &g) >= 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test5: (Colliding transaction, fail)\n");
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load4:\n");
-        assert_se(manager_load_unit(m, "h.service", NULL, &h) == 0);
+        assert_se(manager_load_unit(m, "h.service", NULL, &h) >= 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test10: (Unmeargable job type of auxiliary job, fail)\n");

diff --git a/test2/a.service b/test2/a.service
index 4ddb8b4622b18ee217444def0232aef6c98eefb5..4168d2d0513bbef615e6edb0ec184fe0bd388317 100644 (file)
--- a/test2/a.service
+++ b/test2/a.service
@@ -1,4 +1,7 @@
-[Meta]
+[Unit]
 Description=A
 Requires=b.service
 Before=b.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/b.service b/test2/b.service
index ca946073d37c276cf7c0de2eefb0b5040d5402f1..e03bae36be79b15d3d0bd31a780aa3e02b318984 100644 (file)
--- a/test2/b.service
+++ b/test2/b.service
@@ -1,3 +1,6 @@
-[Meta]
+[Unit]
 Description=B
 Wants=f.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/c.service b/test2/c.service
index 8800ff70c7fa63514c582353559adda1d3e097af..e2f60a8fbf940f57088b4f43ad510391e5e7e051 100644 (file)
--- a/test2/c.service
+++ b/test2/c.service
@@ -1,3 +1,6 @@
-[Meta]
+[Unit]
 Description=C
 Requires=a.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/d.service b/test2/d.service
index 279c1716c21c98b8ea8981d357edccb955c33a03..921fd2ee1b9b0b4e2793d836ad9cec673087b0f8 100644 (file)
--- a/test2/d.service
+++ b/test2/d.service
@@ -1,5 +1,8 @@
-[Meta]
+[Unit]
 Description=D:Cyclic
 After=b.service
 Before=a.service
 Requires=a.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/e.service b/test2/e.service
index 2e86e33daffe80221056b9e3a32a9af7d4003d8c..5ba98c7c431e8897d19c76f0a51355e8495a2aaa 100644 (file)
--- a/test2/e.service
+++ b/test2/e.service
@@ -1,5 +1,8 @@
-[Meta]
+[Unit]
 Description=E:Cyclic
 After=b.service
 Before=a.service
 Wants=a.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/f.service b/test2/f.service
index d0b30effd774754bd946df402d213d24ff909c20..7dde681c179f8fb2281cc593e91144975706d0e6 100644 (file)
--- a/test2/f.service
+++ b/test2/f.service
@@ -1,2 +1,5 @@
-[Meta]
+[Unit]
 Description=F
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/g.service b/test2/g.service
index e811e6083d1f3f40ab6559eaa9b02a5c2a149e9a..cbfa82a4545e44509a18ac32f8e44a69823ec43a 100644 (file)
--- a/test2/g.service
+++ b/test2/g.service
@@ -1,3 +1,6 @@
-[Meta]
+[Unit]
 Description=G
 Conflicts=e.service
+
+[Service]
+ExecStart=/bin/true

diff --git a/test2/h.service b/test2/h.service
index 4b9ffa3e8394eca9c3f95fcf1235b1660ae56886..74a7751cad4b28bcb7e5d30b561898be6dd9eab3 100644 (file)
--- a/test2/h.service
+++ b/test2/h.service
@@ -1,3 +1,6 @@
-[Meta]
+[Unit]
 Description=H
 Wants=g.service
+
+[Service]
+ExecStart=/bin/true