commit 551ca6ef9bed220fc92ebd063094087db9f7741a
author Josh Gao <jmgao@google.com> Mon Oct 24 21:29:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 21:29:59 2016 +0000
tree dd956d496043b9d4ff8643cfd86c579e5cd10b04
parent a1cb9dd6d6ac53d6984c96a5e7dcddcd75e060c5
parent 4897ad02f8bb7872adcabf0b2c6ebb684cde66d4

adb: fix test_sighup. am: 470622f064 am: 8baf1198ee am: 48ba39854e
am: 7617a039f6

Change-Id: I7b966d56a6fa9ebef5e9725c2518d25e6c844a9b

adb/test_device.py

diff --git a/adb/test_device.py b/adb/test_device.py
index ac7cf3b..02a16e4 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -522,13 +522,14 @@
             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)
@@ -536,7 +537,7 @@
 
         # 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")