Mercurial > kallithea
comparison kallithea/tests/functional/test_admin.py @ 8686:b095e2fbba44
model: always import whole meta module - also when referencing Session
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 12 Oct 2020 11:21:15 +0200 |
parents | e35373106528 |
children | 5e46f73f0d1c |
comparison
equal
deleted
inserted
replaced
8685:dff9658bdd98 | 8686:b095e2fbba44 |
---|---|
1 import csv | 1 import csv |
2 import datetime | 2 import datetime |
3 import os | 3 import os |
4 from os.path import dirname | 4 from os.path import dirname |
5 | 5 |
6 from kallithea.model import meta | |
6 from kallithea.model.db import UserLog | 7 from kallithea.model.db import UserLog |
7 from kallithea.model.meta import Session | |
8 from kallithea.tests import base | 8 from kallithea.tests import base |
9 | 9 |
10 | 10 |
11 FIXTURES = os.path.join(dirname(dirname(os.path.abspath(__file__))), 'fixtures') | 11 FIXTURES = os.path.join(dirname(dirname(os.path.abspath(__file__))), 'fixtures') |
12 | 12 |
14 class TestAdminController(base.TestController): | 14 class TestAdminController(base.TestController): |
15 | 15 |
16 @classmethod | 16 @classmethod |
17 def setup_class(cls): | 17 def setup_class(cls): |
18 UserLog.query().delete() | 18 UserLog.query().delete() |
19 Session().commit() | 19 meta.Session().commit() |
20 | 20 |
21 def strptime(val): | 21 def strptime(val): |
22 fmt = '%Y-%m-%d %H:%M:%S' | 22 fmt = '%Y-%m-%d %H:%M:%S' |
23 if '.' not in val: | 23 if '.' not in val: |
24 return datetime.datetime.strptime(val, fmt) | 24 return datetime.datetime.strptime(val, fmt) |
38 v = strptime(v) | 38 v = strptime(v) |
39 if k in ['user_id', 'repository_id']: | 39 if k in ['user_id', 'repository_id']: |
40 # nullable due to FK problems | 40 # nullable due to FK problems |
41 v = None | 41 v = None |
42 setattr(ul, k, v) | 42 setattr(ul, k, v) |
43 Session().add(ul) | 43 meta.Session().add(ul) |
44 Session().commit() | 44 meta.Session().commit() |
45 | 45 |
46 @classmethod | 46 @classmethod |
47 def teardown_class(cls): | 47 def teardown_class(cls): |
48 UserLog.query().delete() | 48 UserLog.query().delete() |
49 Session().commit() | 49 meta.Session().commit() |
50 | 50 |
51 def test_index(self): | 51 def test_index(self): |
52 self.log_user() | 52 self.log_user() |
53 response = self.app.get(base.url(controller='admin/admin', action='index')) | 53 response = self.app.get(base.url(controller='admin/admin', action='index')) |
54 response.mustcontain('Admin Journal') | 54 response.mustcontain('Admin Journal') |