Reorder settled check in tests

Because information moves from merge_client.build_sets to
sched.result_event_queue, perform the merge_client check first
because that is less racy in case of a context switch between
the two checks.

Change-Id: I0c55ee5f04a404f5ab9e3095d2cfabb10a8f64e9
1 file changed