[Checkins] SVN: persistent/trunk/persistent/ Coverage.
Tres Seaver
cvs-admin at zope.org
Mon May 14 23:22:56 UTC 2012
Log message for revision 125883:
Coverage.
Changed:
U persistent/trunk/persistent/pyPersistence.py
U persistent/trunk/persistent/tests/test_pyPersistence.py
U persistent/trunk/persistent/tests/test_timestamp.py
U persistent/trunk/persistent/timestamp.py
-=-
Modified: persistent/trunk/persistent/pyPersistence.py
===================================================================
--- persistent/trunk/persistent/pyPersistence.py 2012-05-14 23:22:48 UTC (rev 125882)
+++ persistent/trunk/persistent/pyPersistence.py 2012-05-14 23:22:53 UTC (rev 125883)
@@ -23,17 +23,13 @@
from persistent.interfaces import CHANGED
from persistent.interfaces import STICKY
from persistent.timestamp import TimeStamp
+from persistent.timestamp import _ZERO
OID_TYPE = SERIAL_TYPE = bytes
-def _makeOctets(s):
- if sys.version_info < (3,):
- return bytes(s)
- return bytes(s, 'ascii') #pragma NO COVER
+_INITIAL_SERIAL = _ZERO
-_INITIAL_SERIAL = _makeOctets('\x00' * 8)
-
# Bitwise flags
_CHANGED = 0x0001
_STICKY = 0x0002
Modified: persistent/trunk/persistent/tests/test_pyPersistence.py
===================================================================
--- persistent/trunk/persistent/tests/test_pyPersistence.py 2012-05-14 23:22:48 UTC (rev 125882)
+++ persistent/trunk/persistent/tests/test_pyPersistence.py 2012-05-14 23:22:53 UTC (rev 125883)
@@ -37,7 +37,7 @@
return jar
def _makeOneWithJar(self, klass=None):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
OID = _makeOctets('\x01' * 8)
if klass is not None:
inst = klass()
@@ -95,7 +95,7 @@
self.assertRaises(ValueError, _test)
def test_assign_p_oid_w_valid_oid(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
OID = _makeOctets('\x01' * 8)
inst = self._makeOne()
inst._p_oid = OID
@@ -103,7 +103,7 @@
inst._p_oid = OID # reassign only same OID
def test_assign_p_oid_w_new_oid_wo_jar(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
OID1 = _makeOctets('\x01' * 8)
OID2 = _makeOctets('\x02' * 8)
inst = self._makeOne()
@@ -112,7 +112,7 @@
self.assertEqual(inst._p_oid, OID2)
def test_assign_p_oid_w_new_oid_w_jar(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
inst, jar, OID = self._makeOneWithJar()
new_OID = _makeOctets('\x02' * 8)
def _test():
@@ -120,7 +120,7 @@
self.assertRaises(ValueError, _test)
def test_delete_p_oid_wo_jar(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
OID = _makeOctets('\x01' * 8)
inst = self._makeOne()
inst._p_oid = OID
@@ -158,14 +158,14 @@
self.assertRaises(ValueError, _test)
def test_assign_p_serial_w_valid_serial(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
SERIAL = _makeOctets('\x01' * 8)
inst = self._makeOne()
inst._p_serial = SERIAL
self.assertEqual(inst._p_serial, SERIAL)
def test_delete_p_serial(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
from persistent.pyPersistence import _INITIAL_SERIAL
SERIAL = _makeOctets('\x01' * 8)
inst = self._makeOne()
@@ -554,7 +554,7 @@
self._checkMRU(jar, [OID])
def test___setattr___p__names(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
SERIAL = _makeOctets('\x01' * 8)
inst, jar, OID = self._makeOneWithJar()
inst._p_activate()
@@ -993,7 +993,7 @@
self._checkMRU(jar, [OID])
def test__p_setattr_w__p__name(self):
- from persistent.pyPersistence import _makeOctets
+ from persistent.timestamp import _makeOctets
SERIAL = _makeOctets('\x01' * 8)
inst, jar, OID = self._makeOneWithJar()
inst._p_deactivate()
Modified: persistent/trunk/persistent/tests/test_timestamp.py
===================================================================
--- persistent/trunk/persistent/tests/test_timestamp.py 2012-05-14 23:22:48 UTC (rev 125882)
+++ persistent/trunk/persistent/tests/test_timestamp.py 2012-05-14 23:22:53 UTC (rev 125883)
@@ -13,6 +13,34 @@
##############################################################################
import unittest
+class Test__UTC(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from persistent.timestamp import _UTC
+ return _UTC
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_tzname(self):
+ utc = self._makeOne()
+ self.assertEqual(utc.tzname(), 'UTC')
+
+ def test_utcoffset(self):
+ from datetime import timedelta
+ utc = self._makeOne()
+ self.assertEqual(utc.utcoffset(object()), timedelta(0))
+
+ def test_dst(self):
+ utc = self._makeOne()
+ self.assertEqual(utc.dst(), 0)
+
+ def test_fromutc(self):
+ source = object()
+ utc = self._makeOne()
+ self.assertTrue(utc.fromutc(source) is source)
+
+
class TimeStampTests(unittest.TestCase):
def _getTargetClass(self):
Modified: persistent/trunk/persistent/timestamp.py
===================================================================
--- persistent/trunk/persistent/timestamp.py 2012-05-14 23:22:48 UTC (rev 125882)
+++ persistent/trunk/persistent/timestamp.py 2012-05-14 23:22:53 UTC (rev 125883)
@@ -19,17 +19,12 @@
import sys
-if sys.version_info < (2, 6):
- _RAWTYPE = str
-else:
- _RAWTYPE = bytes
+_RAWTYPE = bytes
def _makeOctets(s):
- if sys.version_info < (2, 6,):
- return str(s)
if sys.version_info < (3,):
return bytes(s)
- return bytes(s, 'ascii')
+ return bytes(s, 'ascii') #pragma NO COVERAGE
_ZERO = _makeOctets('\x00' * 8)
More information about the checkins
mailing list