Skip test_ioctl_suspend_and_resume_output on Android too.

Author: serhiy-storchaka

Lib/test/test_ioctl.py

@@ -4,7 +4,7 @@
 import sys
 import threading
 import unittest
-from test.support import get_attribute
+from test import support
 from test.support import threading_helper
 from test.support.import_helper import import_module
 fcntl = import_module('fcntl')
@@ -13,7 +13,7 @@
 class IoctlTestsTty(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        TIOCGPGRP = get_attribute(termios, 'TIOCGPGRP')
+        TIOCGPGRP = support.get_attribute(termios, 'TIOCGPGRP')
         try:
             tty = open("/dev/tty", "rb")
         except OSError:
@@ -143,8 +143,8 @@ def setUp(self):
     def test_ioctl_clear_input_or_output(self):
         wfd = self.slave_fd
         rfd = self.master_fd
-        # The data is buffered in input buffer on Linux, and in
-        # output buffer on other platforms.
+        # The data is buffered in the input buffer on Linux, and in
+        # the output buffer on other platforms.
         inbuf = sys.platform in ('linux', 'android')
 
         os.write(wfd, b'abcdef')
@@ -165,6 +165,7 @@ def test_ioctl_clear_input_or_output(self):
         os.write(wfd, b'ABCDEF')
         self.assertEqual(os.read(rfd, 1024), b'ABCDEF')
 
+    @support.skip_android_selinux('tcflow')
     @unittest.skipUnless(sys.platform in ('linux', 'android'), 'only works on Linux')
     @unittest.skipUnless(hasattr(termios, 'TCXONC'), 'requires termios.TCXONC')
     def test_ioctl_suspend_and_resume_output(self):
@@ -175,20 +176,22 @@ def test_ioctl_suspend_and_resume_output(self):
 
         def writer():
             os.write(wfd, b'abc')
-            write_suspended.wait()
+            self.assertTrue(write_suspended.wait(5))
             os.write(wfd, b'def')
             write_finished.set()
 
         with threading_helper.start_threads([threading.Thread(target=writer)]):
             self.assertEqual(os.read(rfd, 3), b'abc')
             try:
-                fcntl.ioctl(wfd, termios.TCXONC, termios.TCOOFF)
-                write_suspended.set()
+                try:
+                    fcntl.ioctl(wfd, termios.TCXONC, termios.TCOOFF)
+                finally:
+                    write_suspended.set()
                 self.assertFalse(write_finished.wait(0.5),
                                  'output was not suspended')
             finally:
                 fcntl.ioctl(wfd, termios.TCXONC, termios.TCOON)
-            self.assertTrue(write_finished.wait(0.5),
+            self.assertTrue(write_finished.wait(5),
                             'output was not resumed')
             self.assertEqual(os.read(rfd, 1024), b'def')
 

Lib/test/test_termios.py

@@ -152,8 +152,8 @@ def test_tcflush_errors(self):
     def test_tcflush_clear_input_or_output(self):
         wfd = self.fd
         rfd = self.master_fd
-        # The data is buffered in input buffer on Linux, and in
-        # output buffer on other platforms.
+        # The data is buffered in the input buffer on Linux, and in
+        # the output buffer on other platforms.
         inbuf = sys.platform in ('linux', 'android')
 
         os.write(wfd, b'abcdef')
@@ -202,20 +202,22 @@ def test_tcflow_suspend_and_resume_output(self):
 
         def writer():
             os.write(wfd, b'abc')
-            write_suspended.wait()
+            self.assertTrue(write_suspended.wait(5))
             os.write(wfd, b'def')
             write_finished.set()
 
         with threading_helper.start_threads([threading.Thread(target=writer)]):
             self.assertEqual(os.read(rfd, 3), b'abc')
             try:
-                termios.tcflow(wfd, termios.TCOOFF)
-                write_suspended.set()
+                try:
+                    termios.tcflow(wfd, termios.TCOOFF)
+                finally:
+                    write_suspended.set()
                 self.assertFalse(write_finished.wait(0.5),
                                  'output was not suspended')
             finally:
                 termios.tcflow(wfd, termios.TCOON)
-            self.assertTrue(write_finished.wait(0.5),
+            self.assertTrue(write_finished.wait(5),
                             'output was not resumed')
             self.assertEqual(os.read(rfd, 1024), b'def')