adb: fix test_sighup.
Bug: http://b/32336914 Test: python test_device.py Change-Id: I34ba5757b5e650d79327dc6779064acd850ce28e
This commit is contained in:
parent
e76b9f3dde
commit
470622f064
1 changed files with 5 additions and 4 deletions
|
@ -511,13 +511,14 @@ class ShellTest(DeviceTest):
|
|||
trap "echo SIGINT > {path}; exit 0" SIGINT
|
||||
trap "echo SIGHUP > {path}; exit 0" SIGHUP
|
||||
echo Waiting
|
||||
while true; do sleep 100; done
|
||||
read
|
||||
""".format(path=log_path)
|
||||
|
||||
script = ";".join([x.strip() for x in script.strip().splitlines()])
|
||||
|
||||
process = self.device.shell_popen(
|
||||
["sh", "-c", "'{}'".format(script)], kill_atexit=False, stdout=subprocess.PIPE)
|
||||
process = self.device.shell_popen([script], kill_atexit=False,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE)
|
||||
|
||||
self.assertEqual("Waiting\n", process.stdout.readline())
|
||||
process.send_signal(signal.SIGINT)
|
||||
|
@ -525,7 +526,7 @@ class ShellTest(DeviceTest):
|
|||
|
||||
# Waiting for the local adb to finish is insufficient, since it hangs
|
||||
# up immediately.
|
||||
time.sleep(0.25)
|
||||
time.sleep(1)
|
||||
|
||||
stdout, _ = self.device.shell(["cat", log_path])
|
||||
self.assertEqual(stdout.strip(), "SIGHUP")
|
||||
|
|
Loading…
Reference in a new issue