micropython · dpgeorge · Jul 29, 2025 · Jul 29, 2025 · Jul 29, 2025 · Jul 26, 2025
diff --git a/ports/esp32/modules/machine.py b/ports/esp32/modules/machine.py
@@ -189,4 +189,7 @@ def phases(self):
 
 # Delegate to built-in machine module.
 def __getattr__(attr):
-    return getattr(_machine, attr)
+    value = getattr(_machine, attr, None)
+    if value is None:
+        raise ImportError(attr)
+    return value
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
@@ -109,7 +109,7 @@ static void print_reset_info(void) {
 
 static void mp_reset(void) {
     mp_stack_set_top((void *)0x40000000);
-    mp_stack_set_limit(8192);
+    mp_stack_set_limit(8192 - 64);
     mp_hal_init();
     gc_init(heap, heap + sizeof(heap));
     mp_init();

diff --git a/py/persistentcode.h b/py/persistentcode.h
@@ -54,9 +54,9 @@
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_X64)
 #elif MICROPY_EMIT_THUMB
     #if defined(__thumb2__)
-        #if defined(__ARM_FP) && (__ARM_FP & 8) == 8
+        #if defined(__ARM_FP) && (__ARM_FP & 8) == 8 && defined(__ARM_PCS_VFP)
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EMDP)
-        #elif defined(__ARM_FP) && (__ARM_FP & 4) == 4
+        #elif defined(__ARM_FP) && (__ARM_FP & 4) == 4 && defined(__ARM_PCS_VFP)
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EMSP)
         #else
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EM)

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
@@ -26,7 +26,10 @@
         (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
     )
 elif "esp32" in sys.platform:
-    i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
+    if "ESP32C3" in sys.implementation._machine or "ESP32-C3" in sys.implementation._machine:
+        i2s_instances = ((0, Pin(5), Pin(6), Pin(7), Pin(4)),)
+    else:
+        i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
     # Allow for small additional RTOS overhead
     MAX_DELTA_MS = 8
 

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
@@ -16,6 +16,9 @@
 if "alif" in sys.platform:
     MAX_DELTA_MS = 20
     spi_instances = ((0, None, None, None),)
+elif "samd" in sys.platform:
+    # Use default SPI instance (tested working on ADAFRUIT_ITSYBITSY_M0_EXPRESS).
+    spi_instances = ((None, None, None, None),)
 elif "pyboard" in sys.platform:
     spi_instances = (
         (1, None, None, None),  # "explicit choice of sck/mosi/miso is not implemented"
@@ -25,10 +28,10 @@
     spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
 elif "esp32" in sys.platform:
     impl = str(sys.implementation)
-    if any(soc in impl for soc in ("ESP32C2", "ESP32C3", "ESP32C6")):
-        spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
+    if any(soc in impl for soc in ("ESP32C2", "ESP32C3", "ESP32-C3", "ESP32C6")):
+        spi_instances = ((1, None, None, None),)
     else:
-        spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
+        spi_instances = ((1, None, None, None), (2, None, None, None))
 elif "esp8266" in sys.platform:
     MAX_DELTA_MS = 50  # port requires much looser timing requirements
     spi_instances = ((1, None, None, None),)  # explicit pin choice not allowed
@@ -111,8 +114,10 @@ def test_spi(spi_id, sck, mosi, miso, baudrate, polarity, phase, print_results):
             polarity=polarity,
             phase=phase,
         )
-    else:
+    elif spi_id is not None:
         s = SPI(spi_id, baudrate=baudrate, polarity=polarity, phase=phase)
+    else:
+        s = SPI(baudrate=baudrate, polarity=polarity, phase=phase)
 
     # to keep the test runtime down, use shorter buffer for lower baud rate
     wr_buf = wr_long if baudrate > 500_000 else wr_short

diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py
@@ -45,6 +45,8 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMBlockDevice(50)
+    vfs.VfsLfs2.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit

diff --git a/tests/float/string_format_modulo2_intbig.py b/tests/float/string_format_modulo2_intbig.py
@@ -1,5 +1,13 @@
 # test formatting floats with large precision, that it doesn't overflow the buffer
 
+try:
+    import micropython
+except:
+
+    class micropython:
+        def bytecode(f):
+            return f
+
 
 def test(num, num_str):
     if num == float("inf") or num == 0.0 and num_str != "0.0":
@@ -18,6 +26,12 @@ def test(num, num_str):
 
 
 # check most powers of 10, making sure to include exponents with 3 digits
-for e in range(-101, 102):
-    num = pow(10, e)
-    test(num, "1e%d" % e)
+# force bytecode emitter so it can feed the WDT on esp8266
+@micropython.bytecode
+def main():
+    for e in range(-101, 102):
+        num = pow(10, e)
+        test(num, "1e%d" % e)
+
+
+main()
diff --git a/tests/multi_net/asyncio_tls_server_client.py b/tests/multi_net/asyncio_tls_server_client.py
@@ -69,5 +69,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data"))
diff --git a/tests/multi_net/asyncio_tls_server_client_cert_required_error.py b/tests/multi_net/asyncio_tls_server_client_cert_required_error.py
@@ -8,6 +8,10 @@
     print("SKIP")
     raise SystemExit
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.

diff --git a/tests/multi_net/asyncio_tls_server_client_readline.py b/tests/multi_net/asyncio_tls_server_client_readline.py
@@ -73,5 +73,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data\nclient data2\n"))
diff --git a/tests/multi_net/asyncio_tls_server_client_verify_error.py b/tests/multi_net/asyncio_tls_server_client_verify_error.py
@@ -73,5 +73,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data"))
diff --git a/tests/multi_net/ssl_cert_ec.py b/tests/multi_net/ssl_cert_ec.py
@@ -45,6 +45,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
@@ -45,6 +45,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_check_hostname_error.py b/tests/multi_net/sslcontext_check_hostname_error.py
@@ -43,6 +43,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_getpeercert.py b/tests/multi_net/sslcontext_getpeercert.py
@@ -25,6 +25,9 @@
 
 # Server
 def instance0():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.globals(IP=multitest.get_network_ip())
     s = socket.socket()
     s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py
@@ -44,6 +44,10 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py
@@ -45,6 +45,10 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(tls, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_server_client_files.py b/tests/multi_net/sslcontext_server_client_files.py
@@ -42,6 +42,10 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_verify_callback.py b/tests/multi_net/sslcontext_verify_callback.py
@@ -32,6 +32,10 @@ def verify_callback(cert, depth):
 
 # Server
 def instance0():
+    if not hasattr(tls, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.globals(IP=multitest.get_network_ip())
     s = socket.socket()
     s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

diff --git a/tests/multi_net/sslcontext_verify_error.py b/tests/multi_net/sslcontext_verify_error.py
@@ -43,6 +43,10 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/sslcontext_verify_time_error.py b/tests/multi_net/sslcontext_verify_time_error.py
@@ -43,6 +43,10 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
+
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

diff --git a/tests/multi_net/tls_dtls_server_client.py b/tests/multi_net/tls_dtls_server_client.py
@@ -7,6 +7,10 @@
     print("SKIP")
     raise SystemExit
 
+if not hasattr(tls, "PROTOCOL_DTLS_SERVER"):
+    print("SKIP")
+    raise SystemExit
+
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.

diff --git a/tests/multi_net/udp_data_multi.py b/tests/multi_net/udp_data_multi.py
@@ -5,7 +5,7 @@
 
 NUM_NEW_SOCKETS = 4
 NUM_PACKET_BURSTS = 6
-NUM_PACKET_GROUPS = 5
+NUM_PACKET_GROUPS = 4
 TOTAL_PACKET_BURSTS = NUM_NEW_SOCKETS * NUM_PACKET_BURSTS
 # The tast passes if more than 75% of packets are received in each group.
 PACKET_RECV_THRESH = 0.75 * TOTAL_PACKET_BURSTS

diff --git a/tests/multi_net/udp_data_multi.py.exp b/tests/multi_net/udp_data_multi.py.exp
@@ -7,7 +7,6 @@ pass group=0
 pass group=1
 pass group=2
 pass group=3
-pass group=4
 --- instance1 ---
 test socket 0
 test socket 1

diff --git a/tests/net_hosted/ssl_verify_callback.py b/tests/net_hosted/ssl_verify_callback.py
@@ -4,6 +4,12 @@
 import socket
 import tls
 
+context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+
+if not hasattr(context, "verify_callback"):
+    print("SKIP")
+    raise SystemExit
+
 
 def verify_callback(cert, depth):
     print("verify_callback:", type(cert), len(cert) > 100, depth)
@@ -16,7 +22,6 @@ def verify_callback_fail(cert, depth):
 
 
 def test(peer_addr):
-    context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
     context.verify_mode = tls.CERT_OPTIONAL
     context.verify_callback = verify_callback
     s = socket.socket()

diff --git a/tests/net_inet/asyncio_tls_open_connection_readline.py b/tests/net_inet/asyncio_tls_open_connection_readline.py
@@ -2,6 +2,10 @@
 import os
 import asyncio
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 # This certificate was obtained from micropython.org using openssl:
 # $ openssl s_client -showcerts -connect micropython.org:443 </dev/null 2>/dev/null
 # The certificate is from Let's Encrypt:

diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
@@ -1,6 +1,9 @@
 import socket
 import ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
 
 # This certificate was obtained from micropython.org using openssl:
 # $ openssl s_client -showcerts -connect micropython.org:443 </dev/null 2>/dev/null

diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
@@ -3,6 +3,10 @@
 
 import sys, errno, select, socket, ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test(addr, hostname, block=True):
     print("---", hostname)

diff --git a/tests/net_inet/test_sslcontext_client.py b/tests/net_inet/test_sslcontext_client.py
@@ -2,6 +2,10 @@
 import socket
 import ssl
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 # This certificate was obtained from micropython.org using openssl:
 # $ openssl s_client -showcerts -connect micropython.org:443 </dev/null 2>/dev/null
 # The certificate is from Let's Encrypt:

diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
@@ -1,5 +1,12 @@
 import socket, ssl, errno, sys, time, select
 
+# Although this test doesn't need ssl.CERT_REQUIRED, it does require the ssl module
+# to support modern ciphers.  So exclude the test on axTLS which doesn't have
+# CERT_REQUIRED.
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 
 def test_one(site, opts):
     ai = socket.getaddrinfo(site, 443, socket.AF_INET)

diff --git a/tests/net_inet/tls_num_errors.py b/tests/net_inet/tls_num_errors.py
@@ -3,15 +3,21 @@
 import socket, ssl, sys
 
 try:
-    from micropython import alloc_emergency_exception_buf, heap_lock, heap_unlock
+    from micropython import heap_lock, heap_unlock
 except:
     print("SKIP")
     raise SystemExit
 
+try:
+    from micropython import alloc_emergency_exception_buf
+
+    alloc_emergency_exception_buf(256)
+except:
+    pass
+
 
 # test with heap locked to see it switch to number-only error message
 def test(addr):
-    alloc_emergency_exception_buf(256)
     s = socket.socket()
     s.connect(addr)
     try: