Allow multiple entrance

Author: kaste

mockito/inorder.py

@@ -49,12 +49,14 @@ def __init__(self, *objects: object):
                 f"{[str(d) for d in duplicates]}"
             )
         self._objects = objects
-        for obj in objects:
+        self._attach_all()
+        self.ordered_invocations: Deque[RealInvocation] = deque()
+
+    def _attach_all(self):
+        for obj in self._objects:
             if m := mock_registry.mock_for(obj):
                 m.attach(self)
 
-        self.ordered_invocations: Deque[RealInvocation] = deque()
-
     def update(self, invocation: RealInvocation) -> None:
         self.ordered_invocations.append(invocation)
 
@@ -93,6 +95,7 @@ def verify(
         )
 
     def __enter__(self):
+        self._attach_all()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):

mockito/mocking.py

@@ -72,10 +72,14 @@ def __init__(
         self._observers: list = []
 
     def attach(self, observer) -> None:
-        self._observers.append(observer)
+        if observer not in self._observers:
+            self._observers.append(observer)
 
     def detach(self, observer) -> None:
-        self._observers.remove(observer)
+        try:
+            self._observers.remove(observer)
+        except ValueError:
+            pass
 
     def remember(self, invocation: invocation.RealInvocation) -> None:
         self.invocations.append(invocation)

tests/in_order_test.py

@@ -161,6 +161,17 @@ def test_do_not_record_after_detach():
         in_order.verify(cat).meow()
 
 
+def test_allow_double_entrance():
+    cat = mock()
+    in_order = InOrder(cat)
+    with in_order:
+        pass
+    cat.meow()
+    with in_order:
+        cat.meow()
+    in_order.verify(cat, times=1).meow()
+
+
 def test_in_order_verify_times_across_mocks():
     cat = mock()
     dog = mock()