TBR: services/device/internal/impl/daemonreap: reorder test to reduce race
Make a small change to reduce the raciness of the TestDaemonRestart
test.
Change-Id: I098c2964697880ef88d514f3a611b9bc72721634
diff --git a/services/device/internal/impl/daemonreap/daemon_reaping_test.go b/services/device/internal/impl/daemonreap/daemon_reaping_test.go
index 945d463..b751fdb 100644
--- a/services/device/internal/impl/daemonreap/daemon_reaping_test.go
+++ b/services/device/internal/impl/daemonreap/daemon_reaping_test.go
@@ -61,14 +61,15 @@
// instance2ID is not running.
utiltest.VerifyState(t, ctx, device.InstanceStateNotRunning, appID, instance2ID)
+ // Be sure to get the ping from the restarted application so that the app is running
+ // again before we ask for its status.
+ pingCh.WaitForPingArgs(t)
+
// instance1ID was restarted automatically.
utiltest.VerifyState(t, ctx, device.InstanceStateRunning, appID, instance1ID)
// Get application pid.
pid = utiltest.GetPid(t, ctx, appID, instance1ID)
- // Be sure to get the ping from the restarted application so that we block in
- // RunApp below.
- pingCh.WaitForPingArgs(t)
// Kill the application again.
syscall.Kill(int(pid), 9)
utiltest.PollingWait(t, int(pid))
