X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test-engine.c;h=85d7697c353c9391ee11d5629e207aa5a7ac099f;hp=53cac92e725197109243fdb8dde78aa0de8b3788;hb=0301abf48ed3be921c33d409c73b554435cf6378;hpb=e094e853a047e10f0d2989eed76b6aa430e3ea1a

diff --git a/test-engine.c b/test-engine.c
index 53cac92e7..85d7697c3 100644
--- a/test-engine.c
+++ b/test-engine.c
@@ -9,18 +9,18 @@
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *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;
         Job *j;
 
-        assert_se(chdir("test2") == 0);
+        assert_se(set_unit_path("test2") >= 0);
 
         assert_se(m = manager_new());
 
         printf("Load1:\n");
-        assert_se(manager_load_name(m, "a.service", &a) == 0);
-        assert_se(manager_load_name(m, "b.service", &b) == 0);
-        assert_se(manager_load_name(m, "c.service", &c) == 0);
-        manager_dump_names(m, stdout, "\t");
+        assert_se(manager_load_unit(m, "a.service", &a) == 0);
+        assert_se(manager_load_unit(m, "b.service", &b) == 0);
+        assert_se(manager_load_unit(m, "c.service", &c) == 0);
+        manager_dump_units(m, stdout, "\t");
 
         printf("Test1: (Trivial)\n");
         assert_se(manager_add_job(m, JOB_START, c, JOB_REPLACE, false, &j) == 0);
@@ -28,9 +28,9 @@ int main(int argc, char *argv[]) {
 
         printf("Load2:\n");
         manager_clear_jobs(m);
-        assert_se(manager_load_name(m, "d.service", &d) == 0);
-        assert_se(manager_load_name(m, "e.service", &e) == 0);
-        manager_dump_names(m, stdout, "\t");
+        assert_se(manager_load_unit(m, "d.service", &d) == 0);
+        assert_se(manager_load_unit(m, "e.service", &e) == 0);
+        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);
@@ -45,8 +45,8 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load3:\n");
-        assert_se(manager_load_name(m, "g.service", &g) == 0);
-        manager_dump_names(m, stdout, "\t");
+        assert_se(manager_load_unit(m, "g.service", &g) == 0);
+        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);
@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load4:\n");
-        assert_se(manager_load_name(m, "h.service", &h) == 0);
-        manager_dump_names(m, stdout, "\t");
+        assert_se(manager_load_unit(m, "h.service", &h) == 0);
+        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);