7 files changed, 37 insertions, 1 deletions
diff --git a/tests/basics/bytes_compare2.py b/tests/basics/bytes_compare2.py
index 02516de93a..8959da3ae7 100644
--- a/tests/basics/bytes_compare2.py
+++ b/tests/basics/bytes_compare2.py
@@ -1,6 +1,5 @@
 print(b"1" == 1)
 print(b"123" == bytearray(b"123"))
-print(b"123" == "123")
 print(b'123' < bytearray(b"124"))
 print(b'123' > bytearray(b"122"))
 print(bytearray(b"23") in b"1234")
diff --git a/tests/basics/bytes_compare3.py b/tests/basics/bytes_compare3.py
new file mode 100644
index 0000000000..4b9cbd5b3a
--- /dev/null
+++ b/tests/basics/bytes_compare3.py
@@ -0,0 +1,9 @@
+# Based on MicroPython config option, comparison of str and bytes
+# or vice versa may issue a runtime warning. On CPython, if run as
+# "python3 -b", only comparison of str to bytes issues a warning,
+# not the other way around (while exactly comparison of bytes to
+# str would be the most common error, as in sock.recv(3) == "GET").
+# Update: the issue above with CPython apparently happens in REPL,
+# when run as a script, both lines issue a warning.
+print("123" == b"123")
+print(b"123" == "123")
diff --git a/tests/basics/bytes_compare3.py.exp b/tests/basics/bytes_compare3.py.exp
new file mode 100644
index 0000000000..7b117b9056
--- /dev/null
+++ b/tests/basics/bytes_compare3.py.exp
@@ -0,0 +1,4 @@
+########
+False
+########
+False
diff --git a/tests/basics/bytes_find.py b/tests/basics/bytes_find.py
index 434669a901..75ef9796cd 100644
--- a/tests/basics/bytes_find.py
+++ b/tests/basics/bytes_find.py
@@ -21,3 +21,6 @@ print(b"0000".find(b'-1', 3))
 print(b"0000".find(b'1', 3))
 print(b"0000".find(b'1', 4))
 print(b"0000".find(b'1', 5))
+
+# Non-ascii values (make sure not treated as unicode-like)
+print(b"\x80abc".find(b"a", 1))
diff --git a/tests/basics/bytes_partition.py b/tests/basics/bytes_partition.py
index 3868a81a55..7d3ffaaaaa 100644
--- a/tests/basics/bytes_partition.py
+++ b/tests/basics/bytes_partition.py
@@ -1,3 +1,10 @@
+try:
+    str.partition
+except AttributeError:
+    print("SKIP")
+    import sys
+    sys.exit()
+
 print(b"asdf".partition(b'g'))
 print(b"asdf".partition(b'a'))
 print(b"asdf".partition(b's'))
diff --git a/tests/basics/string_partition.py b/tests/basics/string_partition.py
index fe0070a658..b3b2f0907d 100644
--- a/tests/basics/string_partition.py
+++ b/tests/basics/string_partition.py
@@ -1,3 +1,10 @@
+try:
+    str.partition
+except AttributeError:
+    print("SKIP")
+    import sys
+    sys.exit()
+
 print("asdf".partition('g'))
 print("asdf".partition('a'))
 print("asdf".partition('s'))
diff --git a/tests/basics/string_rpartition.py b/tests/basics/string_rpartition.py
index 656121c94d..84e0031fb0 100644
--- a/tests/basics/string_rpartition.py
+++ b/tests/basics/string_rpartition.py
@@ -1,3 +1,10 @@
+try:
+    str.partition
+except AttributeError:
+    print("SKIP")
+    import sys
+    sys.exit()
+
 print("asdf".rpartition('g'))
 print("asdf".rpartition('a'))
 print("asdf".rpartition('s'))