Commit777da5b

committed

gh-132742: Fix tcflush() tests on Android

1 parent6677c2c commit777da5bCopy full SHA for 777da5b

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@ def setUp(self):`
`143`	`143`	`deftest_ioctl_clear_input_or_output(self):`
`144`	`144`	`wfd=self.slave_fd`
`145`	`145`	`rfd=self.master_fd`
`146`		`-inbuf=sys.platform=='linux'`
	`146`	`+# The data is buffered in input buffer on Linux, and in`
	`147`	`+# output buffer on other platforms.`
	`148`	`+inbuf=sys.platformin ('linux','android')`
`147`	`149`
`148`	`150`	`os.write(wfd,b'abcdef')`
`149`	`151`	`self.assertEqual(os.read(rfd,2),b'ab')`
`@@ -163,7 +165,7 @@ def test_ioctl_clear_input_or_output(self):`
`163`	`165`	`os.write(wfd,b'ABCDEF')`
`164`	`166`	`self.assertEqual(os.read(rfd,1024),b'ABCDEF')`
`165`	`167`
`166`		`-@unittest.skipUnless(sys.platform=='linux','only works on Linux')`
	`168`	`+@unittest.skipUnless(sys.platformin ('linux','android'),'only works on Linux')`
`167`	`169`	`@unittest.skipUnless(hasattr(termios,'TCXONC'),'requires termios.TCXONC')`
`168`	`170`	`deftest_ioctl_suspend_and_resume_output(self):`
`169`	`171`	`wfd=self.slave_fd`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,9 @@ def test_tcflush_errors(self):`
`152`	`152`	`deftest_tcflush_clear_input_or_output(self):`
`153`	`153`	`wfd=self.fd`
`154`	`154`	`rfd=self.master_fd`
`155`		`-inbuf=sys.platform=='linux'`
	`155`	`+# The data is buffered in input buffer on Linux, and in`
	`156`	`+# output buffer on other platforms.`
	`157`	`+inbuf=sys.platformin ('linux','android')`
`156`	`158`
`157`	`159`	`os.write(wfd,b'abcdef')`
`158`	`160`	`self.assertEqual(os.read(rfd,2),b'ab')`
`@@ -190,7 +192,8 @@ def test_tcflow_errors(self):`
`190`	`192`	`self.assertRaises(TypeError,termios.tcflow,object(),termios.TCOON)`
`191`	`193`	`self.assertRaises(TypeError,termios.tcflow,self.fd)`
`192`	`194`
`193`		`-@unittest.skipUnless(sys.platform=='linux','only works on Linux')`
	`195`	`+@support.skip_android_selinux('tcflow')`
	`196`	`+@unittest.skipUnless(sys.platformin ('linux','android'),'only works on Linux')`
`194`	`197`	`deftest_tcflow_suspend_and_resume_output(self):`
`195`	`198`	`wfd=self.fd`
`196`	`199`	`rfd=self.master_fd`

Comments

(0)