ソースを参照

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
 from sqlalchemy.ext.declarative import declarative_base
1
 from sqlalchemy.ext.declarative import declarative_base
2
 from sqlalchemy.schema import MetaData
2
 from sqlalchemy.schema import MetaData
3
-from sqlalchemy import inspect
4
-
5
-from tracim.exceptions import ContentRevisionUpdateError
6
 
3
 
7
 # Recommended naming convention used by Alembic, as various different database
4
 # Recommended naming convention used by Alembic, as various different database
8
 # providers will autogenerate vastly different names making migrations more
5
 # providers will autogenerate vastly different names making migrations more
10
 NAMING_CONVENTION = {
7
 NAMING_CONVENTION = {
11
     "ix": "ix_%(column_0_label)s",
8
     "ix": "ix_%(column_0_label)s",
12
     "uq": "uq_%(table_name)s_%(column_0_name)s",
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
     "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
13
     "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
15
     "pk": "pk_%(table_name)s"
14
     "pk": "pk_%(table_name)s"
16
 }
15
 }

+ 0 - 0
tracim/tests/__init__.py ファイルの表示


tracim/tests.py → tracim/tests/example_test.py ファイルの表示

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