Author: rjollos
Date: Wed Oct 30 04:42:33 2013
New Revision: 1536964
URL: http://svn.apache.org/r1536964
Log:
0.8dev: Isolate import of `unittest2` module to a single location.
The comparision `sys.version < (2, 7)` in `tests.core` was incorrect (the
correct comparision is `sys.version_info < (2, 7)`). To simplify things, we
import `unittest2 as unittest` in `tests.__init__` and import unittest from
`tests` everywhere else.
Modified:
bloodhound/trunk/bloodhound_multiproduct/tests/__init__.py
bloodhound/trunk/bloodhound_multiproduct/tests/core.py
bloodhound/trunk/bloodhound_multiproduct/tests/env.py
bloodhound/trunk/bloodhound_multiproduct/tests/hooks.py
bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/__init__.py
bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/pygments.py
bloodhound/trunk/bloodhound_multiproduct/tests/model.py
bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py
bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/__init__.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/__init__.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/__init__.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/__init__.py Wed Oct 30
04:42:33 2013
@@ -16,12 +16,12 @@
# specific language governing permissions and limitations
# under the License.
+import sys
from collections import deque
from fnmatch import fnmatch
-import sys
-try:
+if sys.version_info < (2, 7):
import unittest2 as unittest
-except ImportError:
+else:
import unittest
from pkg_resources import resource_listdir, resource_isdir, resource_exists
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/core.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/core.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/core.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/core.py Wed Oct 30 04:42:33
2013
@@ -15,16 +15,13 @@
# specific language governing permissions and limitations
# under the License.
-import sys
-if sys.version < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+from tests import unittest
from trac.core import Interface, implements, Component
from multiproduct.core import MultiProductExtensionPoint
+
class MultiProductExtensionPointTestCase(unittest.TestCase):
def setUp(self):
from trac.core import ComponentManager, ComponentMeta
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/env.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/env.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/env.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/env.py Wed Oct 30 04:42:33
2013
@@ -22,17 +22,11 @@
from inspect import stack
import os.path
import shutil
-from sqlite3 import OperationalError
-import sys
import tempfile
+from sqlite3 import OperationalError
+from tests import unittest
from types import MethodType
-
-if sys.version_info < (2, 7):
- import unittest2 as unittest
- from unittest2.case import _AssertRaisesContext
-else:
- import unittest
- from unittest.case import _AssertRaisesContext
+from unittest.case import _AssertRaisesContext
from trac.config import Option
from trac.core import Component, ComponentMeta
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/hooks.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/hooks.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/hooks.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/hooks.py Wed Oct 30 04:42:33
2013
@@ -17,11 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-
-try:
- import unittest2 as unittest
-except ImportError:
- import unittest
+from tests import unittest
from trac.web.href import Href
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/__init__.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/__init__.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/__init__.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/__init__.py Wed Oct
30 04:42:33 2013
@@ -22,4 +22,3 @@ from tests import TestLoader
def test_suite():
return TestLoader().discover_package(__name__, pattern='*.py')
-
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/pygments.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/pygments.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/pygments.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/mimeview/pygments.py Wed Oct
30 04:42:33 2013
@@ -18,19 +18,15 @@
"""Tests for Apache(TM) Bloodhound's Pygments renderer in product
environments"""
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+from tests import unittest
+from tests.env import MultiproductTestCase
from trac.mimeview.api import Mimeview
from trac.mimeview.pygments import PygmentsRenderer
from trac.mimeview.tests import pygments as test_pygments
from trac.web.chrome import Chrome
from multiproduct.env import ProductEnvironment
-from tests.env import MultiproductTestCase
have_pygments = False
@@ -42,6 +38,7 @@ else:
test_python_hello = test_python_hello_mimeview = \
lambda self : None
+
class ProductPygmentsRendererTestCase(super_class, MultiproductTestCase):
@property
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/model.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/model.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/model.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/model.py Wed Oct 30 04:42:33
2013
@@ -18,26 +18,19 @@
"""Tests for multiproduct/model.py"""
import shutil
-import sys
import tempfile
-
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
-
from sqlite3 import OperationalError
+from tests import unittest
-from trac.test import EnvironmentStub
from trac.core import TracError
+from trac.test import EnvironmentStub
+from trac.tests.resource import TestResourceChangeListener
from trac.ticket.model import Ticket
-from multiproduct.env import ProductEnvironment
-from multiproduct.model import Product
from bhdashboard.model import ModelBase
-
from multiproduct.api import MultiProductSystem
-from trac.tests.resource import TestResourceChangeListener
+from multiproduct.env import ProductEnvironment
+from multiproduct.model import Product
class ProductTestCase(unittest.TestCase):
Modified: bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py?rev=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/upgrade.py Wed Oct 30
04:42:33 2013
@@ -17,17 +17,13 @@
# specific language governing permissions and limitations
# under the License.
-from sqlite3 import OperationalError
-from contextlib import contextmanager
import os
import shutil
-import sys
import tempfile
import uuid
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+from sqlite3 import OperationalError
+from contextlib import contextmanager
+from tests 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=1536964&r1=1536963&r2=1536964&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py
(original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/upgrade_postgres.py Wed Oct
30 04:42:33 2013
@@ -30,14 +30,10 @@ except Exception as err:
print err
database_available = False
+import upgrade
from contextlib import contextmanager
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+from tests import unittest
-import upgrade
@unittest.skipUnless(database_available, "Postgres database not available.")
class PostgresEnvironmentUpgradeTestCase(upgrade.EnvironmentUpgradeTestCase):
