Merge branch 'micropython:master' into master

Author: wemos

micropython/aioespnow/README.md

@@ -55,7 +55,7 @@ A small async server example::
     import asyncio
 
     # A WLAN interface must be active to send()/recv()
-    network.WLAN(network.STA_IF).active(True)
+    network.WLAN(network.WLAN.IF_STA).active(True)
 
     e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
     e.active(True)

micropython/net/webrepl/webrepl.py

@@ -102,7 +102,7 @@ def setup_conn(port, accept_handler):
     listen_s.listen(1)
     if accept_handler:
         listen_s.setsockopt(socket.SOL_SOCKET, 20, accept_handler)
-    for i in (network.AP_IF, network.STA_IF):
+    for i in (network.WLAN.IF_AP, network.WLAN.IF_STA):
         iface = network.WLAN(i)
         if iface.active():
             print("WebREPL server started on http://%s:%d/" % (iface.ifconfig()[0], port))

micropython/umqtt.simple/manifest.py

@@ -1,4 +1,4 @@
-metadata(description="Lightweight MQTT client for MicroPython.", version="1.4.0")
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.5.0")
 
 # Originally written by Paul Sokolovsky.
 

micropython/umqtt.simple/umqtt/simple.py

@@ -60,8 +60,9 @@ def set_last_will(self, topic, msg, retain=False, qos=0):
         self.lw_qos = qos
         self.lw_retain = retain
 
-    def connect(self, clean_session=True):
+    def connect(self, clean_session=True, timeout=None):
         self.sock = socket.socket()
+        self.sock.settimeout(timeout)
         addr = socket.getaddrinfo(self.server, self.port)[0][-1]
         self.sock.connect(addr)
         if self.ssl:

python-stdlib/unittest/manifest.py

@@ -1,3 +1,3 @@
-metadata(version="0.10.3")
+metadata(version="0.10.4")
 
 package("unittest")

python-stdlib/unittest/tests/test_exception.py renamed to python-stdlib/unittest/tests/exception.py

@@ -1,3 +1,5 @@
+# This makes unittest return an error code, so is not named "test_xxx.py".
+
 import unittest
 
 

python-stdlib/unittest/tests/test_subtest.py

@@ -0,0 +1,14 @@
+import unittest
+
+
+class Test(unittest.TestCase):
+    def test_subtest_skip(self):
+        for i in range(4):
+            with self.subTest(i=i):
+                print("sub test", i)
+                if i == 2:
+                    self.skipTest("skip 2")
+
+
+if __name__ == "__main__":
+    unittest.main()

python-stdlib/unittest/unittest/__init__.py

@@ -198,7 +198,7 @@ def assertRaises(self, exc, func=None, *args, **kwargs):
         except Exception as e:
             if isinstance(e, exc):
                 return
-            raise
+            raise e
 
         assert False, "%r not raised" % exc
 
@@ -348,7 +348,13 @@ def _handle_test_exception(
     exc = exc_info[1]
     traceback = exc_info[2]
     ex_str = _capture_exc(exc, traceback)
-    if isinstance(exc, AssertionError):
+    if isinstance(exc, SkipTest):
+        reason = exc.args[0]
+        test_result.skippedNum += 1
+        test_result.skipped.append((current_test, reason))
+        print(" skipped:", reason)
+        return
+    elif isinstance(exc, AssertionError):
         test_result.failuresNum += 1
         test_result.failures.append((current_test, ex_str))
         if verbose:
@@ -396,17 +402,12 @@ def run_one(test_function):
                 print(" FAIL")
             else:
                 print(" ok")
-        except SkipTest as e:
-            reason = e.args[0]
-            print(" skipped:", reason)
-            test_result.skippedNum += 1
-            test_result.skipped.append((name, c, reason))
         except Exception as ex:
             _handle_test_exception(
                 current_test=(name, c), test_result=test_result, exc_info=(type(ex), ex, None)
             )
             # Uncomment to investigate failure in detail
-            # raise
+            # raise ex
         finally:
             __test_result__ = None
             __current_test__ = None

tools/ci.sh

@@ -63,6 +63,7 @@ function ci_package_tests_run {
         python-stdlib/os-path/test_path.py \
         python-stdlib/pickle/test_pickle.py \
         python-stdlib/string/test_translate.py \
+        python-stdlib/unittest/tests/exception.py \
         unix-ffi/gettext/test_gettext.py \
         unix-ffi/pwd/test_getpwnam.py \
         unix-ffi/re/test_re.py \
@@ -90,6 +91,7 @@ function ci_package_tests_run {
         python-stdlib/shutil \
         python-stdlib/tempfile \
         python-stdlib/time \
+        python-stdlib/unittest/tests \
         python-stdlib/unittest-discover/tests \
         ; do
         (cd $path && $MICROPYTHON -m unittest)