[Checkins] SVN: persistent/trunk/persistent/tests/test_ Make ZODB-/transaction-dependent functests conditional on their importability.

[Tres Seaver]

Log message for revision 122977:
  Make ZODB-/transaction-dependent functests conditional on their importability.

Changed:
  U   persistent/trunk/persistent/tests/test_PickleCache.py
  U   persistent/trunk/persistent/tests/test_wref.py

-=-
Modified: persistent/trunk/persistent/tests/test_PickleCache.py
===================================================================
--- persistent/trunk/persistent/tests/test_PickleCache.py	2011-09-27 17:46:01 UTC (rev 122976)
+++ persistent/trunk/persistent/tests/test_PickleCache.py	2011-09-27 17:46:53 UTC (rev 122977)
@@ -90,32 +90,42 @@
 
     <<< cache.total_estimated_size # WTF?
     0
+    """
 
+try:
+    import transaction
+    import ZODB
+except ImportError:
+    pass
+else:
+    def new_ghost_w_persistent_classes():
+        """
+        Peristent meta classes work too:
 
-Peristent meta classes work too:
+            >>> import persistent
+            >>> from persistent.tests.utils import ResettingJar
+            >>> jar = ResettingJar()
+            >>> cache = persistent.PickleCache(jar, 10, 100)
+            >>> import ZODB.persistentclass
+            >>> class PC:
+            ...     __metaclass__ = ZODB.persistentclass.PersistentMetaClass
 
-    >>> import ZODB.persistentclass
-    >>> class PC:
-    ...     __metaclass__ = ZODB.persistentclass.PersistentMetaClass
+            >>> PC._p_oid
+            >>> PC._p_jar
+            >>> PC._p_serial
+            >>> PC._p_changed
+            False
 
-    >>> PC._p_oid
-    >>> PC._p_jar
-    >>> PC._p_serial
-    >>> PC._p_changed
-    False
+            >>> cache.new_ghost('2', PC)
+            >>> PC._p_oid
+            '2'
+            >>> PC._p_jar is jar
+            True
+            >>> PC._p_serial
+            >>> PC._p_changed
+            False
+        """
 
-    >>> cache.new_ghost('2', PC)
-    >>> PC._p_oid
-    '2'
-    >>> PC._p_jar is jar
-    True
-    >>> PC._p_serial
-    >>> PC._p_changed
-    False
-
-    """
-
-if 0: # this test doesn't belong here!
     def cache_invalidate_and_minimize_used_to_leak_None_ref():
         """Persistent weak references
 

Modified: persistent/trunk/persistent/tests/test_wref.py
===================================================================
--- persistent/trunk/persistent/tests/test_wref.py	2011-09-27 17:46:01 UTC (rev 122976)
+++ persistent/trunk/persistent/tests/test_wref.py	2011-09-27 17:46:53 UTC (rev 122977)
@@ -19,7 +19,13 @@
     from doctest import DocTestSuite
 
 def test_suite():
-    return DocTestSuite('persistent.wref')
+    try:
+        import transaction
+        import ZODB
+    except ImportError:
+        return unittest.TestSuite()
+    else:
+        return DocTestSuite('persistent.wref')
 
 if __name__ == '__main__':
     unittest.main()