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=15ce70f1acb6a8ee67881018c2e36a173ac51ddf;hb=501c7d0b77607fe858911b1c94070b63b6cc221e;hpb=16354eff99fe673f912862138c4dce30bbd0afb5

diff --git a/test-engine.c b/test-engine.c
index 15ce70f1a..85d7697c3 100644
--- a/test-engine.c
+++ b/test-engine.c
@@ -9,37 +9,71 @@
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e;
+        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("Loaded1:\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");
+        printf("Load1:\n");
+        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);
         manager_dump_jobs(m, stdout, "\t");
 
-        printf("Loaded2:\n");
+        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) == -ELOOP);
+        assert_se(manager_add_job(m, JOB_START, d, JOB_REPLACE, false, &j) == -ENOEXEC);
         manager_dump_jobs(m, stdout, "\t");
 
-        printf("Test3: (Cyclic Order, Fixable)\n");
+        printf("Test3: (Cyclic Order, Fixable, Garbage Collector)\n");
         assert_se(manager_add_job(m, JOB_START, e, JOB_REPLACE, false, &j) == 0);
         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);
+        manager_dump_jobs(m, stdout, "\t");
+
+        printf("Load3:\n");
+        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);
+
+        printf("Test6: (Colliding transaction, replace)\n");
+        assert_se(manager_add_job(m, JOB_START, g, JOB_REPLACE, false, &j) == 0);
+        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);
+
+        printf("Test8: (Mergeable job type, fail)\n");
+        assert_se(manager_add_job(m, JOB_RESTART, g, JOB_FAIL, false, &j) == 0);
+        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);
+        manager_dump_jobs(m, stdout, "\t");
+
+        printf("Load4:\n");
+        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);
+        manager_dump_jobs(m, stdout, "\t");
+
         manager_free(m);
 
         return 0;