Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Deal with variations in older Android versions
  • Loading branch information
mhsmith committed Apr 18, 2024
commit d5cadd57acd941f41b0e5884540f7e67884a6e8a
12 changes: 8 additions & 4 deletions Lib/test/test_android.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@


# Test redirection of stdout and stderr to the Android log.
@unittest.skipIf(
api_level < 23 and platform.machine() == "aarch64",
"SELinux blocks reading logs on older ARM64 emulators"
)
class TestAndroidOutput(unittest.TestCase):
maxDiff = None

Expand Down Expand Up @@ -118,9 +122,9 @@ def write(s, lines=None):
else "\U0001f600"])

# Null characters will truncate a message.
write("\u0000", [""])
write("\u0000", [] if api_level < 24 else [""])
write("a\u0000", ["a"])
write("\u0000b", [""])
write("\u0000b", [] if api_level < 24 else [""])
write("a\u0000b", ["a"])

# Multi-line messages. Avoid identical consecutive lines, as
Comment thread
serhiy-storchaka marked this conversation as resolved.
Expand Down Expand Up @@ -224,9 +228,9 @@ def write(b, lines=None):
else "\U0001f600"])

# Null characters will truncate a message.
write(b"\x00", [""])
write(b"\x00", [] if api_level < 24 else [""])
write(b"a\x00", ["a"])
write(b"\x00b", [""])
write(b"\x00b", [] if api_level < 24 else [""])
write(b"a\x00b", ["a"])

# Invalid UTF-8
Expand Down