From e76b9f3dde800b44c4151ebee9ff469b6714d8aa Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Fri, 21 Oct 2016 12:40:42 -0700
Subject: [PATCH] adb: fix race condition in test_non_interactive_sigint.

Fix race condition in the test_non_interactive_sigint test by
looping for a while.

Bug: http://b/32336914
Test: python test_device.py
Change-Id: Ie65a762ad6f04815231add5444762c4c0ffd31cb
---
 adb/test_device.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/adb/test_device.py b/adb/test_device.py
index b12bf88b5..2f2a823bf 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -473,8 +473,12 @@ class ShellTest(DeviceTest):
         self.device.shell(proc_query)
         os.kill(sleep_proc.pid, signal.SIGINT)
         sleep_proc.communicate()
-        self.assertEqual(1, self.device.shell_nocheck(proc_query)[0],
-                         'subprocess failed to terminate')
+
+        # It can take some time for the process to receive the signal and die.
+        end_time = time.time() + 3
+        while self.device.shell_nocheck(proc_query)[0] != 1:
+            self.assertFalse(time.time() > end_time,
+                             'subprocess failed to terminate in time')
 
     def test_non_interactive_stdin(self):
         """Tests that non-interactive shells send stdin."""