-

cool-RR · cool-RR · commit 96979cb5ec86 · 2011-10-05T14:45:52.000+02:00
diff --git a/garlicsim/garlicsim/general_misc/module_tasting/sys_modules_unchanged_assertor.py b/garlicsim/garlicsim/general_misc/module_tasting/sys_modules_unchanged_assertor.py
@@ -40,8 +40,21 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
         new_modules_in_sys_modules = [module_name for module_name in
                                       sys.modules if module_name not in
                                       self.old_sys_modules]
-        assert set(new_modules_in_sys_modules).issubset(
+        if not set(new_modules_in_sys_modules).issubset(
             known_false_positive_new_modules
-        )
+        ):
+            unexpected_modules = sorted(
+                list(
+                    set(
+                        set(new_modules_in_sys_modules).difference(
+                        known_false_positive_new_modules
+                        )
+                    )
+                )
+            )
+            raise RuntimeError(
+                'The modules `%s` were added to `sys.modules`, while we '
+                'expected `sys.modules` to be unchanged.' % unexpected_modules
+            )
 
 
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_module_tasting/test_sys_modules_unchanged_assertor.py b/garlicsim/test_garlicsim/test_general_misc/test_module_tasting/test_sys_modules_unchanged_assertor.py
@@ -0,0 +1,76 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing pacakge for `SysModulesUnchangedAssertor`.'''
+
+from __future__ import with_statement
+
+import sys
+import uuid
+
+import nose
+
+from garlicsim.general_misc import cute_testing
+from garlicsim.general_misc import module_tasting
+from garlicsim.general_misc.module_tasting.sys_modules_unchanged_assertor \
+                                            import SysModulesUnchangedAssertor
+
+class MyException(Exception):
+    pass
+        
+        
+def test_without_change():
+    '''
+    Test that `SysModulesUnchangedAssertor` doesn't raise exception needlessly.
+    '''
+    with SysModulesUnchangedAssertor():
+        pass
+
+
+def test_with_change():
+    '''Test `SysModulesUnchangedAssertor` raises exception when needed.'''    
+    with SysModulesUnchangedAssertor():
+        random_key = str(uuid.uuid4())
+        with cute_testing.RaiseAssertor(exception_type=RuntimeError,
+                                        text=' we expected `sys.modules` to '
+                                             'be unchanged',
+                                        assert_exact_type=True):
+            with SysModulesUnchangedAssertor():
+                sys.modules[uuid] = None
+            
+        assert uuid in sys.modules
+        del sys.modules[uuid]
+    
+
+def test_error_propagation_without_change():
+    '''
+    Test that `SysModulesUnchangedAssertor` propagates any exception.
+    
+    This tests when `sys.modules` was not changed.
+    '''
+    with cute_testing.RaiseAssertor(exception_type=MyException,
+                                    text='meow',
+                                    assert_exact_type=True):        
+        with SysModulesUnchangedAssertor():
+            raise MyException('meow')
+        
+
+def test_error_propagation_with_change():
+    '''
+    Test that `SysModulesUnchangedAssertor` propagates any exception.
+    
+    This tests when `sys.modules` was changed.
+    '''
+    with SysModulesUnchangedAssertor():
+        random_key = str(uuid.uuid4())
+        with cute_testing.RaiseAssertor(exception_type=MyException,
+                                        text='frrr',
+                                        assert_exact_type=True):        
+            with SysModulesUnchangedAssertor():
+                sys.modules[uuid] = None
+                raise MyException('frrr')
+            
+        
+        assert uuid in sys.modules
+        del sys.modules[uuid]
+    
