dbus: make errors reported via D-Bus more useful

[elogind.git] / src / test-engine.c

diff --git a/src/test-engine.c b/src/test-engine.c
index 89631c4659c05d9114727d4cf8b92242dfadfca0..d10196b12fface8f669ea9cf36f83e1b32d8f2f8 100644 (file)
--- a/src/test-engine.c
+++ b/src/test-engine.c
@@ -36,61 +36,61 @@ int main(int argc, char *argv[]) {
         assert_se(manager_new(MANAGER_SYSTEM, &m) >= 0);
 
         printf("Load1:\n");
         assert_se(manager_new(MANAGER_SYSTEM, &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, NULL, &a) >= 0);
+        assert_se(manager_load_unit(m, "b.service", NULL, NULL, &b) >= 0);
+        assert_se(manager_load_unit(m, "c.service", NULL, NULL, &c) >= 0);

         manager_dump_units(m, stdout, "\t");
 
         printf("Test1: (Trivial)\n");
         manager_dump_units(m, stdout, "\t");
 
         printf("Test1: (Trivial)\n");

-        assert_se(manager_add_job(m, JOB_START, c, JOB_REPLACE, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_START, c, JOB_REPLACE, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load2:\n");
         manager_clear_jobs(m);
         manager_dump_jobs(m, stdout, "\t");
 
         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, NULL, &d) >= 0);
+        assert_se(manager_load_unit(m, "e.service", NULL, NULL, &e) >= 0);

         manager_dump_units(m, stdout, "\t");
 
         printf("Test2: (Cyclic Order, Unfixable)\n");
         manager_dump_units(m, stdout, "\t");
 
         printf("Test2: (Cyclic Order, Unfixable)\n");

-        assert_se(manager_add_job(m, JOB_START, d, JOB_REPLACE, false, &j) == -ENOEXEC);
+        assert_se(manager_add_job(m, JOB_START, d, JOB_REPLACE, false, NULL, &j) == -ENOEXEC);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test3: (Cyclic Order, Fixable, Garbage Collector)\n");
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test3: (Cyclic Order, Fixable, Garbage Collector)\n");

-        assert_se(manager_add_job(m, JOB_START, e, JOB_REPLACE, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_START, e, JOB_REPLACE, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test4: (Identical transaction)\n");
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test4: (Identical transaction)\n");

-        assert_se(manager_add_job(m, JOB_START, e, JOB_FAIL, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_START, e, JOB_FAIL, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load3:\n");
         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, NULL, &g) >= 0);

         manager_dump_units(m, stdout, "\t");
 
         printf("Test5: (Colliding transaction, fail)\n");
         manager_dump_units(m, stdout, "\t");
 
         printf("Test5: (Colliding transaction, fail)\n");

-        assert_se(manager_add_job(m, JOB_START, g, JOB_FAIL, false, &j) == -EEXIST);
+        assert_se(manager_add_job(m, JOB_START, g, JOB_FAIL, false, NULL, &j) == -EEXIST);

 
         printf("Test6: (Colliding transaction, replace)\n");
 
         printf("Test6: (Colliding transaction, replace)\n");

-        assert_se(manager_add_job(m, JOB_START, g, JOB_REPLACE, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_START, g, JOB_REPLACE, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test7: (Unmeargable job type, fail)\n");
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test7: (Unmeargable job type, fail)\n");

-        assert_se(manager_add_job(m, JOB_STOP, g, JOB_FAIL, false, &j) == -EEXIST);
+        assert_se(manager_add_job(m, JOB_STOP, g, JOB_FAIL, false, NULL, &j) == -EEXIST);

 
         printf("Test8: (Mergeable job type, fail)\n");
 
         printf("Test8: (Mergeable job type, fail)\n");

-        assert_se(manager_add_job(m, JOB_RESTART, g, JOB_FAIL, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_RESTART, g, JOB_FAIL, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test9: (Unmeargable job type, replace)\n");
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Test9: (Unmeargable job type, replace)\n");

-        assert_se(manager_add_job(m, JOB_STOP, g, JOB_REPLACE, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_STOP, g, JOB_REPLACE, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load4:\n");
         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, NULL, &h) >= 0);

         manager_dump_units(m, stdout, "\t");
 
         printf("Test10: (Unmeargable job type of auxiliary job, fail)\n");
         manager_dump_units(m, stdout, "\t");
 
         printf("Test10: (Unmeargable job type of auxiliary job, fail)\n");

-        assert_se(manager_add_job(m, JOB_START, h, JOB_FAIL, false, &j) == 0);
+        assert_se(manager_add_job(m, JOB_START, h, JOB_FAIL, false, NULL, &j) == 0);

         manager_dump_jobs(m, stdout, "\t");
 
         manager_free(m);
         manager_dump_jobs(m, stdout, "\t");
 
         manager_free(m);