kallithea Changeset - 2b9da8749065

Changeset - 2b9da8749065

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 12 years ago 2013-05-19 15:42:08
marcin@python-works.com

Use unittest2 for testing

2 files changed with 7 insertions and 3 deletions:

rhodecode/lib/compat.py

rhodecode/tests/__init__.py

0 comments (0 inline, 0 general)

rhodecode/lib/compat.py

➞

Show inline comments

@@ @@ -29,12 +29,16 @@ from rhodecode import __py_version__, is @@
 #==============================================================================
 # json
 #==============================================================================
 from rhodecode.lib.ext_json import json
 if __py_version__ >= (2, 7):
     import unittest
 else:
     import unittest2 as unittest
 #==============================================================================
 # izip_longest
 #==============================================================================
 try:
     from itertools import izip_longest

rhodecode/tests/__init__.py

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ import time @@
 import logging
 import datetime
 import hashlib
 import tempfile
 from os.path import join as jn
 from unittest import TestCase
 from tempfile import _RandomNameSequence
 from paste.deploy import loadapp
 from paste.script.appinstall import SetupCommand
 import pylons
@@ @@ -38,12 +37,13 @@ from pylons.i18n.translation import _get @@
 from pylons.util import ContextObj
 from routes.util import URLGenerator
 from webtest import TestApp
 from nose.plugins.skip import SkipTest
 from rhodecode.lib.compat import unittest
 from rhodecode import is_windows
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User
 from rhodecode.tests.nose_parametrized import parameterized
 from rhodecode.lib.utils2 import safe_unicode, safe_str
@@ @@ -154,17 +154,17 @@ def init_stack(config=None): @@
     pylons.tmpl_context._push_object(ContextObj())
     # Initialize a translator for tests that utilize i18n
     translator = _get_translator(pylons.config.get('lang'))
     pylons.translator._push_object(translator)
 class BaseTestCase(TestCase):
+class BaseTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         self.wsgiapp = pylons.test.pylonsapp
         init_stack(self.wsgiapp.config)
         TestCase.__init__(self, *args, **kwargs)
+        unittest.TestCase.__init__(self, *args, **kwargs)
 class TestController(BaseTestCase):
     def __init__(self, *args, **kwargs):
         BaseTestCase.__init__(self, *args, **kwargs)

0 comments (0 inline, 0 general)