kallithea Changeset - e62b86858683

Changeset - e62b86858683

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 9 years ago 2017-05-10 23:14:12
dominikruf@gmail.com

tests: move time zone setup to pytest_configure

Test setup stuff belongs in pytest_configure.

2 files changed with 6 insertions and 4 deletions:

kallithea/tests/base.py

kallithea/tests/conftest.py

0 comments (0 inline, 0 general)

kallithea/tests/base.py

➞

Show inline comments

@@ @@ -20,20 +20,17 @@ import re @@
 import tempfile
 import time
 from tg import config
 from webtest import TestApp
-from kallithea import is_windows, model
 from kallithea import model
 from kallithea.model.db import Notification, User, UserNotification
 from kallithea.model.meta import Session
 from kallithea.lib.utils2 import safe_str
 os.environ['TZ'] = 'UTC'
 if not is_windows:
     time.tzset()
 log = logging.getLogger(__name__)
 skipif = pytest.mark.skipif
 parametrize = pytest.mark.parametrize

kallithea/tests/conftest.py

➞

Show inline comments

 import os
 import sys
 import logging
 import pkg_resources
 import time
 from paste.deploy import loadwsgi
 from routes.util import URLGenerator
 import pytest
 from pytest_localserver.http import WSGIServer
@@ @@ -18,12 +19,16 @@ from kallithea.tests.base import invalid @@
     TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS
 import kallithea.tests.base # FIXME: needed for setting testapp instance!!!
 from tg.util.webtest import test_context
 def pytest_configure():
     os.environ['TZ'] = 'UTC'
     if not kallithea.is_windows:
         time.tzset()
     path = os.getcwd()
     sys.path.insert(0, path)
     pkg_resources.working_set.add_entry(path)
     # Disable INFO logging of test database creation, restore with NOTSET
     logging.disable(logging.INFO)

0 comments (0 inline, 0 general)