tree 390012846a95c07913eec9f0a3098490f24bcac5
parent 17dd6779f0c1a3b8ad4665f5903f914cc7788f7f
author James E. Blair <jeblair@hp.com> 1423324881 -0800
committer Joshua Hesketh <josh@nitrotech.org> 1423556678 +1100

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