Mercurial > kallithea
changeset 1707:54fda6ce9e98 beta
fixes timezone issues with tests
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 21 Nov 2011 02:53:17 +0200 |
| parents | 07c8838ebfd3 |
| children | fee9895fa46e |
| files | rhodecode/tests/__init__.py rhodecode/tests/functional/test_changelog.py |
| diffstat | 2 files changed, 10 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/tests/__init__.py Mon Nov 21 00:56:59 2011 +0200 +++ b/rhodecode/tests/__init__.py Mon Nov 21 02:53:17 2011 +0200 @@ -8,6 +8,7 @@ setup-app`) and provides the base testing objects. """ import os +import time from os.path import join as jn from unittest import TestCase @@ -20,11 +21,13 @@ from rhodecode.model import meta import logging +import pylons.test + +os.environ['TZ'] = 'UTC' +time.tzset() log = logging.getLogger(__name__) -import pylons.test - __all__ = ['environ', 'url', 'TestController', 'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO', 'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS' ]
--- a/rhodecode/tests/functional/test_changelog.py Mon Nov 21 00:56:59 2011 +0200 +++ b/rhodecode/tests/functional/test_changelog.py Mon Nov 21 02:53:17 2011 +0200 @@ -12,8 +12,9 @@ self.assertTrue("""<input class="changeset_range" id="5e204e7583b9" """ """name="5e204e7583b9" type="checkbox" value="1" />""" in response.body) - self.assertTrue("""<span>commit 154: 5e204e7583b9@2010-08-10 """ - """02:18:46</span>""" in response.body) + self.assertTrue("""<span>commit 154: 5e204e7583b9@2010-08-09 """ + """23:18:46</span>""" in response.body) + self.assertTrue("""Small update at simplevcs app""" in response.body) @@ -23,7 +24,6 @@ """show more details">3</span>""" in response.body) #pagination - response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO), {'page':1}) response = self.app.get(url(controller='changelog', action='index', @@ -42,8 +42,8 @@ self.assertTrue("""<input class="changeset_range" id="46ad32a4f974" """ """name="46ad32a4f974" type="checkbox" value="1" />""" in response.body) - self.assertTrue("""<span>commit 64: 46ad32a4f974@2010-04-20""" - """ 01:33:21</span>"""in response.body) + self.assertTrue("""<span>commit 64: 46ad32a4f974@2010-04-19""" + """ 22:33:21</span>"""in response.body) self.assertTrue("""<span id="46ad32a4f974e45472a898c6b0acb600320""" """579b1" class="changed_total tooltip" """ @@ -53,9 +53,3 @@ """46ad32a4f974e45472a898c6b0acb600320579b1">""" """Merge with 2e6a2bf9356ca56df08807f4ad86d48""" """0da72a8f4</a></div>""" % HG_REPO in response.body) - - - - #def test_index_git(self): - # self.log_user() - # response = self.app.get(url(controller='changelog', action='index', repo_name=GIT_REPO))