浏览代码

Disable Check naming rules for database+ move tests files

Guénaël Muller 7 年前
父节点
当前提交
3ca798829b
共有 3 个文件被更改,包括 10 次插入11 次删除
  1. 3 4
      tracim/models/meta.py
  2. 0 0
      tracim/tests/__init__.py
  3. 7 7
      tracim/tests/example_test.py

+ 3 - 4
tracim/models/meta.py 查看文件

@@ -1,8 +1,5 @@
1 1
 from sqlalchemy.ext.declarative import declarative_base
2 2
 from sqlalchemy.schema import MetaData
3
-from sqlalchemy import inspect
4
-
5
-from tracim.exceptions import ContentRevisionUpdateError
6 3
 
7 4
 # Recommended naming convention used by Alembic, as various different database
8 5
 # providers will autogenerate vastly different names making migrations more
@@ -10,7 +7,9 @@ from tracim.exceptions import ContentRevisionUpdateError
10 7
 NAMING_CONVENTION = {
11 8
     "ix": "ix_%(column_0_label)s",
12 9
     "uq": "uq_%(table_name)s_%(column_0_name)s",
13
-    "ck": "ck_%(table_name)s_%(constraint_name)s",
10
+    # TODO - G.M - 28-03-2018 - Convert database to allow naming convention
11
+    # for ck contraint.
12
+    # "ck": "ck_%(table_name)s_%(constraint_name)s",
14 13
     "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
15 14
     "pk": "pk_%(table_name)s"
16 15
 }

+ 0 - 0
tracim/tests/__init__.py 查看文件


tracim/tests.py → tracim/tests/example_test.py 查看文件

@@ -13,10 +13,10 @@ class BaseTest(unittest.TestCase):
13 13
         self.config = testing.setUp(settings={
14 14
             'sqlalchemy.url': 'sqlite:///:memory:'
15 15
         })
16
-        self.config.include('.models')
16
+        self.config.include('tracim.models')
17 17
         settings = self.config.get_settings()
18 18
 
19
-        from .models import (
19
+        from tracim.models import (
20 20
             get_engine,
21 21
             get_session_factory,
22 22
             get_tm_session,
@@ -28,11 +28,11 @@ class BaseTest(unittest.TestCase):
28 28
         self.session = get_tm_session(session_factory, transaction.manager)
29 29
 
30 30
     def init_database(self):
31
-        from .models.meta import DeclarativeBase
31
+        from tracim.models.meta import DeclarativeBase
32 32
         DeclarativeBase.metadata.create_all(self.engine)
33 33
 
34 34
     def tearDown(self):
35
-        from .models.meta import DeclarativeBase
35
+        from tracim.models.meta import DeclarativeBase
36 36
 
37 37
         testing.tearDown()
38 38
         transaction.abort()
@@ -45,13 +45,13 @@ class TestMyViewSuccessCondition(BaseTest):
45 45
         super(TestMyViewSuccessCondition, self).setUp()
46 46
         self.init_database()
47 47
 
48
-        from .models import MyModel
48
+        from tracim.models import MyModel
49 49
 
50 50
         model = MyModel(name='one', value=55)
51 51
         self.session.add(model)
52 52
 
53 53
     def test_passing_view(self):
54
-        from .views.default import my_view
54
+        from tracim.views.default import my_view
55 55
         info = my_view(dummy_request(self.session))
56 56
         self.assertEqual(info['one'].name, 'one')
57 57
         self.assertEqual(info['project'], 'tracim')
@@ -60,6 +60,6 @@ class TestMyViewSuccessCondition(BaseTest):
60 60
 class TestMyViewFailureCondition(BaseTest):
61 61
 
62 62
     def test_failing_view(self):
63
-        from .views.default import my_view
63
+        from tracim.views.default import my_view
64 64
         info = my_view(dummy_request(self.session))
65 65
         self.assertEqual(info.status_int, 500)