r2872 - in zodb/trunk/debian (4 files)

[menesis-guest at users.alioth.debian.org]

    Date: Tuesday, August 12, 2014 @ 21:11:03
  Author: menesis-guest
Revision: 2872

debian/patches/new-transaction.patch: Fix test failure with new transaction
debian/patches/testUtils.patch: add forgotten patch

Added:
  zodb/trunk/debian/patches/new-transaction.patch
  zodb/trunk/debian/patches/testUtils.patch
Modified:
  zodb/trunk/debian/changelog
  zodb/trunk/debian/patches/series

Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2014-07-13 17:22:58 UTC (rev 2871)
+++ zodb/trunk/debian/changelog	2014-08-12 21:11:03 UTC (rev 2872)
@@ -3,6 +3,7 @@
   * Team upload.
   * New upstream release.
   * debian/patches/lp_135108.patch: remove, fixed upstream.
+  * debian/patches/new-transaction.patch: Fix test failure with new transaction
   * debian/patches/testUtils.patch: Fix test failure with python2.7 (>= 2.7.6)
   * debian/patches/no_manuel.patch: add to remove manuel from dependencies.
   * debian/rules:

Added: zodb/trunk/debian/patches/new-transaction.patch
===================================================================
--- zodb/trunk/debian/patches/new-transaction.patch	                        (rev 0)
+++ zodb/trunk/debian/patches/new-transaction.patch	2014-08-12 21:11:03 UTC (rev 2872)
@@ -0,0 +1,26 @@
+Description: Fix test failure with transaction (>= 1.3.0)
+Upstream: http://zope3.pov.lt/trac/changeset/126388/ZODB/branches/3.10
+Index: zodb/src/ZODB/tests/testConnectionSavepoint.txt
+===================================================================
+--- zodb.orig/src/ZODB/tests/testConnectionSavepoint.txt
++++ zodb/src/ZODB/tests/testConnectionSavepoint.txt
+@@ -182,15 +182,15 @@ However, using a savepoint invalidates a
+     >>> root['bob-balance']
+     100.0
+ 
+-    >>> savepoint2.rollback()
++    >>> savepoint2.rollback() # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+     ...
+-    InvalidSavepointRollbackError
++    InvalidSavepointRollbackError...
+ 
+-    >>> savepoint1.rollback()
++    >>> savepoint1.rollback() # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+     ...
+-    InvalidSavepointRollbackError
++    InvalidSavepointRollbackError...
+ 
+     >>> transaction.abort()
+ 

Modified: zodb/trunk/debian/patches/series
===================================================================
--- zodb/trunk/debian/patches/series	2014-07-13 17:22:58 UTC (rev 2871)
+++ zodb/trunk/debian/patches/series	2014-08-12 21:11:03 UTC (rev 2872)
@@ -1,2 +1,3 @@
 no-manuel.patch
 testUtils.patch
+new-transaction.patch

Added: zodb/trunk/debian/patches/testUtils.patch
===================================================================
--- zodb/trunk/debian/patches/testUtils.patch	                        (rev 0)
+++ zodb/trunk/debian/patches/testUtils.patch	2014-08-12 21:11:03 UTC (rev 2872)
@@ -0,0 +1,18 @@
+Description: Fix test failure with python2.7 (>= 2.7.6)
+Upstream: http://zope3.pov.lt/trac/changeset/130363/ZODB/branches/3.10
+Index: zodb/src/ZODB/tests/testUtils.py
+===================================================================
+--- zodb.orig/src/ZODB/tests/testUtils.py
++++ zodb/src/ZODB/tests/testUtils.py
+@@ -24,9 +24,9 @@ from ZODB.utils import U64, p64, u64
+ 
+ class TestUtils(unittest.TestCase):
+ 
+-    small = [random.randrange(1, 1L<<32, int=long)
++    small = [random.randrange(1, 1L<<32)
+              for i in range(NUM)]
+-    large = [random.randrange(1L<<32, 1L<<64, int=long)
++    large = [random.randrange(1L<<32, 1L<<64)
+              for i in range(NUM)]
+     all = small + large
+