fixes timezone issues with tests

rhodecode/tests/__init__.py

@@ -1,82 +1,85 b''
 """Pylons application test package
 
 This package assumes the Pylons environment is already loaded, such as
 when this script is imported from the `nosetests --with-pylons=test.ini`
 command.
 
 This module initializes the application via ``websetup`` (`paster
 setup-app`) and provides the base testing objects.
 """
 import os
+import time
 from os.path import join as jn
 
 from unittest import TestCase
 
 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.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' ]
 
 # Invoke websetup with the current config file
 # SetupCommand('setup-app').run([config_file])
 
 ##RUNNING DESIRED TESTS
 # nosetests -x rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account
 # nosetests --pdb --pdb-failures 
 environ = {}
 
 #SOME GLOBALS FOR TESTS
 from tempfile import _RandomNameSequence
 TESTS_TMP_PATH = jn('/', 'tmp', 'rc_test_%s' % _RandomNameSequence().next())
 TEST_USER_ADMIN_LOGIN = 'test_admin'
 TEST_USER_ADMIN_PASS = 'test12'
 HG_REPO = 'vcs_test_hg'
 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
 
         self.app = TestApp(wsgiapp)
         url._push_object(URLGenerator(config['routes.map'], environ))
         self.sa = meta.Session
         self.index_location = config['app_conf']['index_dir']
         TestCase.__init__(self, *args, **kwargs)
 
     def log_user(self, username=TEST_USER_ADMIN_LOGIN,
                  password=TEST_USER_ADMIN_PASS):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':username,
                                   'password':password})
         
         if 'invalid user name' in response.body:
             self.fail('could not login using %s %s' % (username, password))
 
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].username, username)
         return response.follow()
 
     def checkSessionFlash(self, response, msg):
         self.assertTrue('flash' in response.session)
         self.assertTrue(msg in response.session['flash'][0][1])
 

rhodecode/tests/functional/test_changelog.py

@@ -1,61 +1,55 b''
 from rhodecode.tests import *
 
 class TestChangelogController(TestController):
 
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))
 
         self.assertTrue("""<div id="chg_20" class="container">"""
                         in response.body)
         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)
 
 
         self.assertTrue("""<span id="5e204e7583b9c8e7b93a020bd036564b1e"""
                         """731dae" class="changed_total tooltip" """
                         """title="Affected number of files, click to """
                         """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',
                                     repo_name=HG_REPO), {'page':2})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':3})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':4})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':5})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':6})
 
 
         # Test response after pagination...
         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" """
                         """title="Affected number of files, click to """
                         """show more details">21</span>"""in response.body)
         self.assertTrue("""<div class="message"><a href="/%s/changeset/"""
                         """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))