-

cool-RR · cool-RR · commit 0747e68ca035 · 2015-12-13T22:30:49.000+02:00
diff --git a/source_py3/test_python_toolbox/test_context_management/test_idempotentify.py b/source_py3/test_python_toolbox/test_context_management/test_idempotentify.py
@@ -12,7 +12,7 @@ class SomeContextManager(ContextManager):
     def manage_context(self):
         self.x += 1
         try:
-            yield self
+            yield (self, self)
         finally:
             self.x -= 1
             
@@ -21,7 +21,10 @@ def manage_context(self):
 def test_idempotentify():
     some_context_manager = SomeContextManager()
     assert some_context_manager.x == 0
-    with some_context_manager:
+    with some_context_manager as enter_result:
+        assert isinstance(enter_result, tuple)
+        assert len(enter_result) == 2
+        assert enter_result[0] is enter_result[1] is some_context_manager
         assert some_context_manager.x == 1
     assert some_context_manager.x == 0
     
@@ -42,7 +45,20 @@ def test_idempotentify():
     with cute_testing.RaiseAssertor():
         some_context_manager.__exit__(None, None, None)
         
-    idempotent_context_manager = idempotentify(SomeContextManager())
+    ###########################################################################
+    
+        
+    another_context_manager = SomeContextManager()
+    idempotent_context_manager = idempotentify(another_context_manager)
+    
+    assert another_context_manager is idempotent_context_manager.__wrapped__
+
+    with idempotent_context_manager as enter_result:
+        assert isinstance(enter_result, tuple)
+        assert len(enter_result) == 2
+        assert enter_result[0] is enter_result[1] is another_context_manager
+        assert another_context_manager.x == 1
+        
 
     idempotent_context_manager.__enter__()
     assert idempotent_context_manager.__wrapped__.x == 1
