Author: astaric
Date: Mon Apr 29 08:48:39 2013
New Revision: 1476922
URL: http://svn.apache.org/r1476922
Log:
Python2.6 compatibility.
Modified:
bloodhound/trunk/bloodhound_multiproduct/tests/core.py
bloodhound/trunk/bloodhound_multiproduct/tests/perm.py
bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py
bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/core.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/core.py?rev=1476922&r1=1476921&r2=1476922&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/core.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/core.py Mon Apr 29 08:48:39
2013
@@ -15,7 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-import unittest
+import sys
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
from trac.core import Interface, implements, Component
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/perm.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/perm.py?rev=1476922&r1=1476921&r2=1476922&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/perm.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/perm.py Mon Apr 29 08:48:39
2013
@@ -35,6 +35,10 @@ from multiproduct.model import Product
from multiproduct.perm import MultiproductPermissionPolicy, sudo
from tests.env import MultiproductTestCase
+# DefaultPermission policy has its own cache that causes
+# test_product_trac_admin_actions to fail sometimes.
+perm.DefaultPermissionPolicy.CACHE_EXPIRY = 0
+
class ProductDefaultPermissionStoreTestCase(DefaultPermissionStoreTestCase,
MultiproductTestCase):
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py?rev=1476922&r1=1476921&r2=1476922&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py Mon Apr 29
08:48:39 2013
@@ -21,9 +21,13 @@ from sqlite3 import OperationalError
from contextlib import contextmanager
import os
import shutil
+import sys
import tempfile
-import unittest
import uuid
+if sys.version_info < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
from trac.attachment import Attachment, AttachmentAdmin
from trac.core import Component, implements
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py?rev=1476922&r1=1476921&r2=1476922&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py Mon Apr
29 08:48:39 2013
@@ -31,7 +31,11 @@ except Exception as err:
database_available = False
from contextlib import contextmanager
-import unittest
+import sys
+if sys.version_info < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
import upgrade
