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

Commit cf46741b authored by David Pursell's avatar David Pursell
Browse files

adb: fix test_device.py shell protocol checks. 

https://android-review.googlesource.com/#/c/210646/ added a
has_shell_protocol() function but the test_device.py tests were still
trying to use the now-missing SHELL_PROTOCOL_FEATURE constant.

This CL just switches test_device.py to correctly use the
has_shell_protocol() method.

Change-Id: Ie0a2f0dc07529843d25051a01e08fb677551a4e1
Test: `python -m unittest discover -v` on devices with and without
      the shell protocol.
parent 64461c29

adb/test_device.py

+5 −5
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ class ShellTest(DeviceTest): 
        Raises:

          unittest.SkipTest: The device doesn't support exit codes.

        """

        if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features:

        if not self.device.has_shell_protocol():

            raise unittest.SkipTest('exit codes are unavailable on this device')



        proc = subprocess.Popen(
@@ -342,7 +342,7 @@ class ShellTest(DeviceTest): 
        a terminal stdin to test so this test will be skipped if stdin

        is not a terminal.

        """

        if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features:

        if not self.device.has_shell_protocol():

            raise unittest.SkipTest('PTY arguments unsupported on this device')

        if not os.isatty(sys.stdin.fileno()):

            raise unittest.SkipTest('PTY tests require stdin terminal')
@@ -394,7 +394,7 @@ class ShellTest(DeviceTest): 


        Bug: http://b/19734861

        """

        if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features:

        if not self.device.has_shell_protocol():

            raise unittest.SkipTest('shell protocol unsupported on this device')



        # Shell protocol should be used by default.
@@ -424,7 +424,7 @@ class ShellTest(DeviceTest): 


        Bug: http://b/23825725

        """

        if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features:

        if not self.device.has_shell_protocol():

            raise unittest.SkipTest('shell protocol unsupported on this device')



        # Start a long-running process.
@@ -445,7 +445,7 @@ class ShellTest(DeviceTest): 


    def test_non_interactive_stdin(self):

        """Tests that non-interactive shells send stdin."""

        if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features:

        if not self.device.has_shell_protocol():

            raise unittest.SkipTest('non-interactive stdin unsupported '

                                    'on this device')