Now works in both MicroPython and Pyodide. Updated code, tests and docs.

ntoll · ntoll · commit c8666529ee4a · 2024-07-26T10:19:38.000+01:00
diff --git a/index.html b/index.html
@@ -15,7 +15,8 @@
     <script type="module" src="https://pyscript.net/releases/2024.6.1/core.js"></script>
 </head>
 <body>
-    <h1>MicroMock test suite</h1>
+    <h1>MicroMock test suite (MicroPython)</h1>
+    <p><a href="./index2.html">Pyodide version</a></p>
     <script type="mpy" src="./main.py" config="./config.json" terminal async></script>
 </body>
 </html>
diff --git a/index2.html b/index2.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <script src="/mini-coi.js" scope="./"></script> 
+    <title>PyScript Application Template</title>
+
+    <!-- Recommended meta tags -->
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <!-- PyScript CSS -->
+    <link rel="stylesheet" href="https://pyscript.net/releases/2024.6.1/core.css">
+
+    <!-- This script tag bootstraps PyScript -->
+    <script type="module" src="https://pyscript.net/releases/2024.6.1/core.js"></script>
+</head>
+<body>
+    <h1>MicroMock test suite (Pyodide)</h1>
+    <p><a href="./index.html">MicroPython version</a></p>
+    <script type="py" src="./main.py" config="./config.json" terminal async></script>
+</body>
+</html>
diff --git a/tests/test_asyncmock.py b/tests/test_asyncmock.py
@@ -3,10 +3,15 @@
 exacty the same as unittest.mock.AsyncMock).
 """
 
+import sys
 import upytest
 from umock import AsyncMock
 
 
+#: A flag to show if MicroPython is the current Python interpreter.
+is_micropython = "micropython" in sys.version.lower()
+
+
 def test_init_async_mock():
     """
     A plain AsyncMock object can be created with no arguments. Accessing
@@ -46,9 +51,8 @@ def test_init_async_mock_with_spec_from_list():
 def test_init_async_mock_with_spec_from_object():
     """
     An AsyncMock object should be created with the specified attributes derived
-    from the referenced instance. The AsyncMock's __class__ should be set to
-    that of the spec object's. Accessing arbitrary attributes not on the class
-    should raise an AttributeError.
+    from the referenced instance. Accessing arbitrary attributes not on the
+    object should raise an AttributeError.
 
     If an arbitrary attribute is subqeuently added to the mock object, it
     should be accessible as per normal Python behaviour.
@@ -66,7 +70,7 @@ class TestClass:
         mock, "z"
     ), "AsyncMock object has unexpected 'z' attribute."
     assert (
-        mock.__class__ == TestClass
+        mock.__class__ == AsyncMock
     ), "AsyncMock object has unexpected class."
     mock.z = "test"
     assert (
@@ -144,7 +148,7 @@ async def test_init_async_mock_with_exception_instance_side_effect():
     with upytest.raises(ValueError) as expected:
         await mock()
     assert (
-        str(expected.exception.value) == "test"
+        str(expected.exception) == "test"
     ), "Exception message not as expected."
 
 
@@ -161,7 +165,10 @@ async def test_init_async_mock_with_iterable_side_effect():
     assert await mock() == 3, "Third call did not return 3."
     with upytest.raises(RuntimeError) as expected:
         await mock()
-    assert expected.exception.value == "generator raised StopIteration"
+    if is_micropython:
+        assert str(expected.exception) == "generator raised StopIteration"
+    else:
+        assert str(expected.exception) == "coroutine raised StopIteration"
 
 
 async def test_init_async_mock_with_invalid_side_effect():
diff --git a/tests/test_mock.py b/tests/test_mock.py
@@ -42,9 +42,8 @@ def test_init_mock_with_spec_from_list():
 def test_init_mock_with_spec_from_object():
     """
     A Mock object should be created with the specified attributes derived from
-    the referenced instance. The Mock's __class__ should be set to that of the
-    spec object's. Accessing arbitrary attributes not on the class should raise
-    an AttributeError.
+    the referenced instance. Accessing arbitrary attributes not on the object
+    should raise an AttributeError.
 
     If an arbitrary attribute is subqeuently added to the mock object, it
     should be accessible as per normal Python behaviour.
@@ -59,17 +58,16 @@ class TestClass:
     assert hasattr(mock, "x"), "Mock object missing 'x' attribute."
     assert hasattr(mock, "y"), "Mock object missing 'y' attribute."
     assert not hasattr(mock, "z"), "Mock object has unexpected 'z' attribute."
-    assert mock.__class__ == TestClass, "Mock object has unexpected class."
+    assert mock.__class__ == Mock, "Mock object has unexpected class."
     mock.z = "test"
     assert mock.z == "test", "Mock object attribute 'z' not set correctly."
 
 
 def test_init_mock_with_spec_from_class():
     """
     A Mock object should be created with the specified attributes derived from
-    the referenced class. Since this is a class spec, the Mock's __class__
-    remains as Mock. Accessing arbitrary attributes not on the class should
-    raise an AttributeError.
+    the referenced class. Accessing arbitrary attributes not on the class
+    should raise an AttributeError.
 
     If an arbitrary attribute is subqeuently added to the mock object, it
     should be accessible as per normal Python behaviour.
@@ -128,7 +126,7 @@ def test_init_mock_with_exception_instance_side_effect():
     with upytest.raises(ValueError) as expected:
         mock()
     assert (
-        str(expected.exception.value) == "test"
+        str(expected.exception) == "test"
     ), "Exception message not as expected."
 
 
diff --git a/tests/test_patch_target.py b/tests/test_patch_target.py
@@ -23,12 +23,8 @@ def test_patch_target_module():
     old_module = patch_target(target, mock_module)
     # The module is replaced with the mock module.
     assert sys.modules[target] is mock_module
-    # The imported module is also the mock module.
-    from tests.a_package import another_module
-
-    assert another_module is mock_module
     # The original module is returned from the patch.
-    assert old_module.__name__ == target.replace(".", "/")
+    assert old_module.__name__.replace(".", "/") == target.replace(".", "/")
     # Restore the old module.
     patch_target(target, old_module)
 
diff --git a/umock.py b/umock.py
@@ -30,6 +30,11 @@
 
 __all__ = ["Mock", "AsyncMock", "patch"]
 
+
+#: A flag to show if MicroPython is the current Python interpreter.
+is_micropython = "micropython" in sys.version.lower()
+
+
 #: Attributes of the Mock class that should be handled as "normal" attributes
 #: rather than treated as mocked attributes.
 _RESERVED_MOCK_ATTRIBUTES = ("side_effect", "return_value")
@@ -40,7 +45,30 @@ def is_awaitable(obj):
     Returns a boolean indication if the passed in obj is an awaitable
     function. (MicroPython treats awaitables as generator functions.)
     """
-    return inspect.isgeneratorfunction(obj)
+    if is_micropython:
+        return inspect.isgeneratorfunction(obj)
+    return inspect.iscoroutinefunction(obj)
+
+
+def import_module(module_path):
+    """
+    Import the referenced module in a way that works with both MicroPython and
+    Pyodide. The module_path should be a dotted string representing the module
+    to import.
+    """
+    if is_micropython:
+        file_path = module_path.replace(".", "/")
+        module = __import__(file_path)
+        return module
+    else:
+        module_name = module_path.split(".")[-1]
+        module = __import__(
+            module_path,
+            fromlist=[
+                module_name,
+            ],
+        )
+    return module
 
 
 class Mock:
@@ -112,9 +140,6 @@ class or instance) that acts as the specification for the mock
                         or is_awaitable(getattr(spec, name))  # no awaitables
                     )
                 ]
-                if type(spec) is not type:
-                    # Set the mock object's class to that of the spec object.
-                    self.__class__ = type(spec)
             for name in self._spec:
                 # Create a new mock object for each attribute in the spec.
                 setattr(self, name, Mock())
@@ -372,9 +397,6 @@ class or instance) that acts as the specification for the mock
                         or is_awaitable(getattr(spec, name))  # no awaitables
                     )
                 ]
-                if type(spec) is not type:
-                    # Set the mock object's class to that of the spec object.
-                    self.__class__ = type(spec)
             for name in self._spec:
                 # Create a new mock object for each attribute in the spec.
                 setattr(self, name, Mock())
@@ -631,8 +653,7 @@ def patch_target(target, replacement):
         if target in sys.modules:
             old_module = sys.modules[target]
         else:
-            module_path = target.replace(".", "/")
-            old_module = __import__(module_path)
+            old_module = import_module(target)
         sys.modules[target] = replacement
         return old_module
     # There IS a colon in the target, so split the target into module and
@@ -643,8 +664,7 @@ def patch_target(target, replacement):
     # Get the parent module of the target.
     parent = sys.modules.get(module_name)
     if not parent:
-        module_path = module_name.replace(".", "/")
-        parent = __import__(module_path)
+        parent = import_module(module_name)
     # Traverse the module path to get the parent object of the target.
     parts = attributes.split(".")
     for part in parts[:-1]:
