changeset 173093bcb7b2 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=173093bcb7b2
description:
Avoid to import backend before loading configuration
otherwise the backend loaded is always SQLite.
issue8749
review276511002
diffstat:
trytond/tests/__init__.py | 152 ++++++++++++++++++----------------------
trytond/tests/export_data.py | 15 ++-
trytond/tests/field_context.py | 13 ++-
trytond/tests/history.py | 10 ++-
trytond/tests/mptt.py | 11 +-
trytond/tests/run-tests.py | 3 +-
trytond/tests/trigger.py | 12 ++-
trytond/tests/wizard.py | 16 ++-
trytond/tests/workflow.py | 11 +-
9 files changed, 130 insertions(+), 113 deletions(-)
diffs (377 lines):
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/__init__.py
--- a/trytond/tests/__init__.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/__init__.py Mon Dec 02 11:35:47 2019 +0100
@@ -7,96 +7,82 @@
pkg_resources = None
-from ..pool import Pool
-from .mptt import *
-from . import import_data
-from .export_data import *
-from .trigger import *
-from . import access
-from .wizard import *
-from .workflow import *
-from .history import *
-from .field_context import *
-from . import model
-from . import modelstorage
-from . import modelview
-from . import modelsql
-from . import field_boolean
-from . import field_integer
-from . import field_float
-from . import field_numeric
-from . import field_char
-from . import field_text
-from . import field_date
-from . import field_datetime
-from . import field_time
-from . import field_timedelta
-from . import field_selection
-from . import field_dict
-from . import field_binary
-from . import field_many2one
-from . import field_reference
-from . import field_one2many
-from . import field_many2many
-from . import field_one2one
-from . import field_multiselection
-from . import multivalue
-from . import mixin
-from . import tree
-from . import rule
-from . import copy_
+def register():
+ from . import access
+ from . import copy_
+ from . import export_data
+ from . import field_binary
+ from . import field_boolean
+ from . import field_char
+ from . import field_context
+ from . import field_date
+ from . import field_datetime
+ from . import field_dict
+ from . import field_float
+ from . import field_integer
+ from . import field_many2many
+ from . import field_many2one
+ from . import field_multiselection
+ from . import field_numeric
+ from . import field_one2many
+ from . import field_one2one
+ from . import field_reference
+ from . import field_selection
+ from . import field_text
+ from . import field_time
+ from . import field_timedelta
+ from . import history
+ from . import import_data
+ from . import mixin
+ from . import model
+ from . import modelsql
+ from . import modelstorage
+ from . import modelview
+ from . import mptt
+ from . import multivalue
+ from . import rule
+ from . import tree
+ from . import trigger
+ from . import wizard
+ from . import workflow
-
-def register():
- Pool.register(
- MPTT,
- ExportDataTarget,
- ExportData,
- ExportDataTarget2,
- ExportDataRelation,
- Triggered,
- TriggerAction,
- TestWizardStart,
- WorkflowedModel,
- TestHistory,
- TestHistoryLine,
- FieldContextChild,
- FieldContextParent,
- module='tests', type_='model')
- Pool.register(
- TestWizard,
- module='tests', type_='wizard')
-
+ access.register('tests')
+ copy_.register('tests')
+ export_data.register('tests')
+ field_binary.register('tests')
+ field_boolean.register('tests')
+ field_char.register('tests')
+ field_context.register('tests')
+ field_date.register('tests')
+ field_datetime.register('tests')
+ field_dict.register('tests')
+ field_float.register('tests')
+ field_integer.register('tests')
+ field_many2many.register('tests')
+ field_many2one.register('tests')
+ field_multiselection.register('tests')
+ field_numeric.register('tests')
+ field_one2many.register('tests')
+ field_one2one.register('tests')
+ field_reference.register('tests')
+ field_selection.register('tests')
+ field_text.register('tests')
+ field_time.register('tests')
+ field_timedelta.register('tests')
+ history.register('tests')
import_data.register('tests')
- access.register('tests')
+ mixin.register('tests')
model.register('tests')
+ modelsql.register('tests')
modelstorage.register('tests')
modelview.register('tests')
- modelsql.register('tests')
- field_boolean.register('tests')
- field_integer.register('tests')
- field_float.register('tests')
- field_numeric.register('tests')
- field_char.register('tests')
- field_text.register('tests')
- field_date.register('tests')
- field_datetime.register('tests')
- field_time.register('tests')
- field_timedelta.register('tests')
- field_selection.register('tests')
- field_dict.register('tests')
- field_binary.register('tests')
- field_many2one.register('tests')
- field_reference.register('tests')
- field_one2many.register('tests')
- field_many2many.register('tests')
- field_one2one.register('tests')
- field_multiselection.register('tests')
+ mptt.register('tests')
multivalue.register('tests')
- mixin.register('tests')
+ rule.register('tests')
tree.register('tests')
- rule.register('tests')
- copy_.register('tests')
+ trigger.register('tests')
+ wizard.register('tests')
+ workflow.register('tests')
if pkg_resources is not None:
entry_points = pkg_resources.iter_entry_points('trytond.tests')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/export_data.py
--- a/trytond/tests/export_data.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/export_data.py Mon Dec 02 11:35:47 2019 +0100
@@ -2,11 +2,7 @@
# this repository contains the full copyright notices and license terms.
"Test for export_data"
from trytond.model import ModelSQL, fields
-from trytond.pool import PoolMeta
-
-__all__ = [
- 'ExportDataTarget', 'ExportData', 'ExportDataTarget2',
- 'ExportDataRelation']
+from trytond.pool import PoolMeta, Pool
class ExportDataTarget(ModelSQL):
@@ -54,3 +50,12 @@
__name__ = 'test.export_data.relation'
many2many = fields.Many2One('test.export_data', 'Export Data')
target = fields.Many2One('test.export_data.target', 'Target')
+
+
+def register(module):
+ Pool.register(
+ ExportDataTarget,
+ ExportData,
+ ExportDataTarget2,
+ ExportDataRelation,
+ module=module, type_='model')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/field_context.py
--- a/trytond/tests/field_context.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/field_context.py Mon Dec 02 11:35:47 2019 +0100
@@ -3,11 +3,7 @@
from trytond.model import ModelSQL, fields
from trytond.pyson import Eval
-
-__all__ = [
- 'FieldContextParent',
- 'FieldContextChild',
- ]
+from trytond.pool import Pool
class FieldContextParent(ModelSQL):
@@ -23,3 +19,10 @@
class FieldContextChild(ModelSQL):
'Field Context Child'
__name__ = 'test.field_context.child'
+
+
+def register(module):
+ Pool.register(
+ FieldContextParent,
+ FieldContextChild,
+ module=module, type_='model')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/history.py
--- a/trytond/tests/history.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/history.py Mon Dec 02 11:35:47 2019 +0100
@@ -1,8 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from trytond.model import ModelSQL, fields
-
-__all__ = ['TestHistory', 'TestHistoryLine']
+from trytond.pool import Pool
class TestHistory(ModelSQL):
@@ -23,3 +22,10 @@
_history = True
history = fields.Many2One('test.history', 'History')
name = fields.Char('Name')
+
+
+def register(module):
+ Pool.register(
+ TestHistory,
+ TestHistoryLine,
+ module=module, type_='model')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/mptt.py
--- a/trytond/tests/mptt.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/mptt.py Mon Dec 02 11:35:47 2019 +0100
@@ -5,10 +5,7 @@
from sql.conditionals import Case
from trytond.model import ModelView, ModelSQL, DeactivableMixin, tree, fields
-
-__all__ = [
- 'MPTT',
- ]
+from trytond.pool import Pool
class MPTT(DeactivableMixin, tree(), ModelSQL, ModelView):
@@ -33,3 +30,9 @@
@staticmethod
def default_right():
return 0
+
+
+def register(module):
+ Pool.register(
+ MPTT,
+ module=module, type_='model')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/run-tests.py
--- a/trytond/tests/run-tests.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/run-tests.py Mon Dec 02 11:35:47 2019 +0100
@@ -9,7 +9,6 @@
import sys
from trytond.config import config
-from trytond import backend
if __name__ != '__main__':
raise ImportError('%s can not be imported' % __name__)
@@ -35,6 +34,8 @@
config.update_etc(opt.config)
+# Import after application is configured
+from trytond import backend
if backend.name() == 'sqlite':
database_name = ':memory:'
else:
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/trigger.py
--- a/trytond/tests/trigger.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/trigger.py Mon Dec 02 11:35:47 2019 +0100
@@ -1,10 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from trytond.model import ModelSQL, fields
-
-__all__ = [
- 'Triggered', 'TriggerAction',
- ]
+from trytond.pool import Pool
TRIGGER_LOGS = []
@@ -25,3 +22,10 @@
Trigger function for test
'''
TRIGGER_LOGS.append((records, trigger))
+
+
+def register(module):
+ Pool.register(
+ Triggered,
+ TriggerAction,
+ module=module, type_='model')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/wizard.py
--- a/trytond/tests/wizard.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/wizard.py Mon Dec 02 11:35:47 2019 +0100
@@ -1,13 +1,10 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
+from trytond.pool import Pool
+from trytond.transaction import Transaction
from trytond.wizard import Wizard, StateView, StateTransition, StateAction, \
Button
-from trytond.transaction import Transaction
-
-__all__ = [
- 'TestWizardStart', 'TestWizard',
- ]
class TestWizardStart(ModelSQL, ModelView):
@@ -50,3 +47,12 @@
@staticmethod
def transition_action():
return 'end'
+
+
+def register(module):
+ Pool.register(
+ TestWizardStart,
+ module=module, type_='model')
+ Pool.register(
+ TestWizard,
+ module=module, type_='wizard')
diff -r 8afd9b41c1e8 -r 173093bcb7b2 trytond/tests/workflow.py
--- a/trytond/tests/workflow.py Fri Nov 29 15:16:11 2019 +0100
+++ b/trytond/tests/workflow.py Mon Dec 02 11:35:47 2019 +0100
@@ -2,10 +2,7 @@
# repository contains the full copyright notices and license terms.
from trytond.model import ModelSQL, Workflow, fields
-
-__all__ = [
- 'WorkflowedModel',
- ]
+from trytond.pool import Pool
class WorkflowedModel(Workflow, ModelSQL):
@@ -32,3 +29,9 @@
@Workflow.transition('running')
def run(cls, records):
pass
+
+
+def register(module):
+ Pool.register(
+ WorkflowedModel,
+ module=module, type_='model')
