micropython v1.25.0 merge: fix tests

Author: dhalbert

ports/unix/variants/coverage/mpconfigvariant.mk

@@ -12,7 +12,8 @@ CFLAGS += \
 LDFLAGS += -fprofile-arcs -ftest-coverage
 
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
-USER_C_MODULES = $(TOP)/examples/usercmodule
+# CIRCUITPY-CHANGE: don't include user C modules
+# USER_C_MODULES = $(TOP)/examples/usercmodule
 
 # CIRCUITPY-CHANGE: use CircuitPython bindings and implementations
 SRC_QRIO := $(patsubst ../../%,%,$(wildcard ../../shared-bindings/qrio/*.c ../../shared-module/qrio/*.c ../../lib/quirc/lib/*.c))

tests/extmod/re_sub.py

@@ -49,7 +49,8 @@ def A():
 print(re.sub("a", "b", "c"))
 
 # with maximum substitution count specified
-if sys.implementation.name != "micropython":
+# CIRCUITPY-CHANGE: was "micropython"
+if sys.implementation.name != "circuitpython":
     # On CPython 3.13 and later the substitution count must be a keyword argument.
     print(re.sub("a", "b", "1a2a3a", count=2))
 else:

tests/misc/non_compliant.py.exp

@@ -13,8 +13,6 @@ NotImplementedError
 NotImplementedError
 NotImplementedError
 NotImplementedError
-b'\x01\x02'
-b'\x01\x00'
 NotImplementedError
 AttributeError
 TypeError