Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 470622f0 authored by Josh Gao's avatar Josh Gao
Browse files

adb: fix test_sighup. 

Bug: http://b/32336914
Test: python test_device.py
Change-Id: I34ba5757b5e650d79327dc6779064acd850ce28e
parent e76b9f3d

adb/test_device.py

+5 −4
Original line number Original line Diff line number Diff line
@@ -511,13 +511,14 @@ class ShellTest(DeviceTest): 
            trap "echo SIGINT > {path}; exit 0" SIGINT

            trap "echo SIGINT > {path}; exit 0" SIGINT

            trap "echo SIGHUP > {path}; exit 0" SIGHUP

            trap "echo SIGHUP > {path}; exit 0" SIGHUP

            echo Waiting

            echo Waiting

            while true; do sleep 100; done

            read

        """.format(path=log_path)

        """.format(path=log_path)





        script = ";".join([x.strip() for x in script.strip().splitlines()])

        script = ";".join([x.strip() for x in script.strip().splitlines()])





        process = self.device.shell_popen(

        process = self.device.shell_popen([script], kill_atexit=False,

            ["sh", "-c", "'{}'".format(script)], kill_atexit=False, stdout=subprocess.PIPE)

                                          stdin=subprocess.PIPE,

                                          stdout=subprocess.PIPE)





        self.assertEqual("Waiting\n", process.stdout.readline())

        self.assertEqual("Waiting\n", process.stdout.readline())

        process.send_signal(signal.SIGINT)

        process.send_signal(signal.SIGINT)
@@ -525,7 +526,7 @@ class ShellTest(DeviceTest): 




        # Waiting for the local adb to finish is insufficient, since it hangs

        # Waiting for the local adb to finish is insufficient, since it hangs

        # up immediately.

        # up immediately.

        time.sleep(0.25)

        time.sleep(1)





        stdout, _ = self.device.shell(["cat", log_path])

        stdout, _ = self.device.shell(["cat", log_path])

        self.assertEqual(stdout.strip(), "SIGHUP")

        self.assertEqual(stdout.strip(), "SIGHUP")