Changeset c6d87c10 in mainline

Timestamp:

2019-08-06T19:25:44Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

d89b259

Parents:

dba056b

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-06-20 01:05:41)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 19:25:44)

Message:

sysman: Update closure tests for new semantics of assigned units

File:

• uspace/srv/sysman/test/job_closure.c (modified) (5 diffs)

uspace/srv/sysman/test/job_closure.c

@@ -88 +88 @@
 static job_t *dummy_job(unit_t *unit, unit_state_t target_state)
 {
-        job_t *old_job = unit->job;
-        unit->job = NULL;
-
         job_t *result = job_create(unit, target_state);
-
-        job_del_ref(&result);
-        unit->job = old_job;
-
         return result;
+}
+
+static void dummy_add_closure(dyn_array_t *closure)
+{
+        dyn_array_foreach(*closure, job_t *, it) {
+                (*it)->unit->job = *it;
+        }
 }
 
@@ -144 +144 @@
         mock_add_dependency(u2, u3);
 
+        /* Intentionally omit u0 */
         job_t *main_job = job_create(u1, STATE_STARTED);
         assert(main_job);
@@ -153 +154 @@
         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
+
+        dummy_add_closure(&act_closure);
 
         PCUT_ASSERT_TRUE(same_jobs(&exp_closure, &act_closure));
@@ -182 +185 @@
         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
+
+        dummy_add_closure(&act_closure);
 
         PCUT_ASSERT_TRUE(same_jobs(&exp_closure, &act_closure));
@@ -214 +219 @@
         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
 
+        dummy_add_closure(&act_closure);
+
         PCUT_ASSERT_TRUE(same_jobs(&exp_closure, &act_closure));
         PCUT_ASSERT_TRUE(job_blocked(u1->job, u2->job));