##// END OF EJS Templates
fix windows test issue with tzset()
marcink -
r2254:8b1a79ad beta
parent child Browse files
Show More
@@ -46,6 +46,9 b' except ImportError:'
46 PLATFORM_WIN = ('Windows')
46 PLATFORM_WIN = ('Windows')
47 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
47 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
48
48
49 is_windows = __platform__ in PLATFORM_WIN
50 is_unix = __platform__ in PLATFORM_OTHERS
51
49 requirements = [
52 requirements = [
50 "Pylons==1.0.0",
53 "Pylons==1.0.0",
51 "Beaker==1.6.3",
54 "Beaker==1.6.3",
@@ -68,7 +71,7 b' if __py_version__ < (2, 6):'
68 requirements.append("simplejson")
71 requirements.append("simplejson")
69 requirements.append("pysqlite")
72 requirements.append("pysqlite")
70
73
71 if __platform__ in PLATFORM_WIN:
74 if is_windows:
72 requirements.append("mercurial>=2.2.1,<2.3")
75 requirements.append("mercurial>=2.2.1,<2.3")
73 else:
76 else:
74 requirements.append("py-bcrypt")
77 requirements.append("py-bcrypt")
@@ -21,13 +21,15 b' from pylons import config, url'
21 from routes.util import URLGenerator
21 from routes.util import URLGenerator
22 from webtest import TestApp
22 from webtest import TestApp
23
23
24 from rhodecode import is_windows
24 from rhodecode.model.meta import Session
25 from rhodecode.model.meta import Session
25 from rhodecode.model.db import User
26 from rhodecode.model.db import User
26
27
27 import pylons.test
28 import pylons.test
28
29
29 os.environ['TZ'] = 'UTC'
30 os.environ['TZ'] = 'UTC'
30 time.tzset()
31 if not is_windows:
32 time.tzset()
31
33
32 log = logging.getLogger(__name__)
34 log = logging.getLogger(__name__)
33
35
@@ -71,6 +73,7 b" NEW_GIT_REPO = 'vcs_test_git_new'"
71 HG_FORK = 'vcs_test_hg_fork'
73 HG_FORK = 'vcs_test_hg_fork'
72 GIT_FORK = 'vcs_test_git_fork'
74 GIT_FORK = 'vcs_test_git_fork'
73
75
76
74 class TestController(TestCase):
77 class TestController(TestCase):
75
78
76 def __init__(self, *args, **kwargs):
79 def __init__(self, *args, **kwargs):
General Comments 0
You need to be logged in to leave comments. Login now