tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adb: fix race condition in test_non_interactive_sigint.

Browse source 
am: e76b9f3dde

Change-Id: Ib2b6c1118cb48c337c12efbd223c87fee76837f2
This commit is contained in:
Josh Gao 2016-10-24 21:18:51 +00:00 committed by android-build-merger
commit a06580956e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/test_device.py
View file

@ -484,8 +484,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."""