[Zope3-checkins] CVS: Zope3/src/persistence/tests - __init__.py:1.1.2.2 test_cache.py:1.1.2.2 test_list.py:1.1.2.3 test_persistence.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:31 -0500
Update of /cvs-repository/Zope3/src/persistence/tests
In directory cvs.zope.org:/tmp/cvs-serv19240/src/persistence/tests
Modified Files:
Tag: NameGeddon-branch
__init__.py test_cache.py test_list.py test_persistence.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/persistence/tests/__init__.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/persistence/tests/__init__.py:1.1.2.1 Mon Dec 23 14:30:41 2002
+++ Zope3/src/persistence/tests/__init__.py Tue Dec 24 21:19:57 2002
@@ -2,13 +2,13 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
""" Persistence unit tests."""
=== Zope3/src/persistence/tests/test_cache.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/persistence/tests/test_cache.py:1.1.2.1 Mon Dec 23 14:30:41 2002
+++ Zope3/src/persistence/tests/test_cache.py Tue Dec 24 21:19:57 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import unittest, sys, time
@@ -92,7 +92,7 @@
self.assertEqual(dm.cache.statistics(),
{'ghosts': 0, 'active': 0},
)
-
+
def testGC(self):
dm=DM(Cache(inactive=1, size=2))
p1=P()
@@ -110,7 +110,7 @@
self.assertEqual(dm.cache.statistics(),
{'ghosts': 1, 'active': 0},
)
-
+
p1.a=1
p1._p_atime=int(time.time()-5000)%86400
p1._p_changed=0
@@ -121,10 +121,10 @@
self.assertEqual(dm.cache.statistics(),
{'ghosts': 1, 'active': 0},
)
-
-
-
-
+
+
+
+
from persistence import Persistent
@@ -136,7 +136,7 @@
def __init__(self, cache):
self.called=0
self.cache=cache
-
+
def register(self, ob): self.called += 1
def setstate(self, ob):
ob.__setstate__({'x': 42})
@@ -149,4 +149,3 @@
if __name__=='__main__':
unittest.TextTestRunner().run(test_suite())
-
=== Zope3/src/persistence/tests/test_list.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/persistence/tests/test_list.py:1.1.2.2 Tue Dec 24 10:56:34 2002
+++ Zope3/src/persistence/tests/test_list.py Tue Dec 24 21:19:57 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Test the list interface to PersistentList
"""
=== Zope3/src/persistence/tests/test_persistence.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/persistence/tests/test_persistence.py:1.1.2.1 Mon Dec 23 14:30:41 2002
+++ Zope3/src/persistence/tests/test_persistence.py Tue Dec 24 21:19:57 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import unittest
@@ -58,7 +58,7 @@
def testUnsaved(self):
p = self.klass()
-
+
self.assertEqual(p.x, 0)
self.assertEqual(p._p_changed, 0)
self.assertEqual(p._p_jar, None)
@@ -119,7 +119,7 @@
p = Persistent()
self.assert_(IPersistent.isImplementedBy(p),
"%s does not implement IPersistent" % p)
-
+
self.assert_(IPersistent.isImplementedByInstancesOf(P),
"%s does not implement IPersistent" % P)
p = self.klass()
@@ -175,10 +175,10 @@
class B(Persistent):
__slots__ = ["x"]
-
+
def __init__(self):
self.x = 0
-
+
def inc(self):
self.x += 1
@@ -211,7 +211,7 @@
def testPicklableWCustomState(self):
import pickle
-
+
p = P2()
p2 = pickle.loads(pickle.dumps(p))
self.assertEqual(p2.__class__, P2);