kallithea Changeset - 8b1a79ad7a42

Changeset - 8b1a79ad7a42

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-05-10 19:52:11
marcin@python-works.com

fix windows test issue with tzset()

2 files changed with 8 insertions and 2 deletions:

rhodecode/__init__.py

rhodecode/tests/__init__.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -43,12 +43,15 @@ __platform__ = platform.system() @@
 __license__ = 'GPLv3'
 __py_version__ = sys.version_info
 PLATFORM_WIN = ('Windows')
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
 is_windows = __platform__ in PLATFORM_WIN
 is_unix = __platform__ in PLATFORM_OTHERS
 requirements = [
     "Pylons==1.0.0",
     "Beaker==1.6.3",
     "WebHelpers==1.3",
     "formencode==1.2.4",
     "SQLAlchemy==0.7.6",
@@ @@ -65,13 +68,13 @@ requirements = [ @@
+]
 if __py_version__ < (2, 6):
     requirements.append("simplejson")
     requirements.append("pysqlite")
-if __platform__ in PLATFORM_WIN:
+if is_windows:
     requirements.append("mercurial>=2.2.1,<2.3")
 else:
     requirements.append("py-bcrypt")
     requirements.append("mercurial>=2.2.1,<2.3")

rhodecode/tests/__init__.py

➞

Show inline comments

@@ @@ -18,19 +18,21 @@ from tempfile import _RandomNameSequence @@
 from paste.deploy import loadapp
 from paste.script.appinstall import SetupCommand
 from pylons import config, url
 from routes.util import URLGenerator
 from webtest import TestApp
 from rhodecode import is_windows
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User
 import pylons.test
 os.environ['TZ'] = 'UTC'
 time.tzset()
 if not is_windows:
     time.tzset()
 log = logging.getLogger(__name__)
 __all__ = [
     'environ', 'url', 'TestController', 'TESTS_TMP_PATH', 'HG_REPO',
     'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO', 'HG_FORK', 'GIT_FORK',
@@ @@ -68,12 +70,13 @@ GIT_REPO = 'vcs_test_git' @@
 NEW_HG_REPO = 'vcs_test_hg_new'
 NEW_GIT_REPO = 'vcs_test_git_new'
 HG_FORK = 'vcs_test_hg_fork'
 GIT_FORK = 'vcs_test_git_fork'
 class TestController(TestCase):
     def __init__(self, *args, **kwargs):
         wsgiapp = pylons.test.pylonsapp
         config = wsgiapp.config

0 comments (0 inline, 0 general)