tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge test/ into tests/

Browse Source 
review1060002
This commit is contained in:
Cédric Krier
2013-09-16 11:38:11 +02:00
parent cbe59c6bb3
commit ab74123eb2
36 changed files with 175 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MANIFEST.in
+2 -2
View File
@@ -23,8 +23,8 @@ include trytond/res/tryton.cfg
include trytond/res/*.xml
include trytond/res/view/*.xml
include trytond/res/locale/*.po
include trytond/test/tryton.cfg
include trytond/test/*.xml
include trytond/tests/tryton.cfg
include trytond/tests/*.xml
include trytond/webdav/tryton.cfg
include trytond/webdav/*.xml
include trytond/webdav/view/*.xml
setup.py
+1 -1
View File
@@ -31,7 +31,7 @@ setup(name=PACKAGE,
'trytond.ir.ui': ['*.xml', '*.rng', '*.rnc'],
'trytond.res': ['tryton.cfg', '*.xml', 'view/*.xml', 'locale/*.po'],
'trytond.webdav': ['tryton.cfg', '*.xml', 'view/*.xml', 'locale/*.po'],
'trytond.test': ['tryton.cfg', '*.xml'],
'trytond.tests': ['tryton.cfg', '*.xml'],
},
scripts=['bin/trytond'],
classifiers=[
trytond/ir/module/module.xml
+1 -1
View File
@@ -18,7 +18,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Modules</field>
<field name="type">ir.action.act_window</field>
<field name="res_model">ir.module.module</field>
<field name="domain">[('name', '!=', 'test')]</field>
<field name="domain">[('name', '!=', 'tests')]</field>
</record>
<record model="ir.action.act_window.view"
id="act_module_form_view1">
trytond/modules/__init__.py
+6 -6
View File
@@ -196,7 +196,7 @@ def create_graph(module_list):
def is_module_to_install(module):
for kind in ('init', 'update'):
if 'all' in CONFIG[kind] and module != 'test':
if 'all' in CONFIG[kind] and module != 'tests':
return True
elif module in CONFIG[kind]:
return True
@@ -302,7 +302,7 @@ def get_module_list():
module_list.add('ir')
module_list.add('res')
module_list.add('webdav')
module_list.add('test')
module_list.add('tests')
return list(module_list)
@@ -316,15 +316,15 @@ def register_classes():
trytond.res.register()
import trytond.webdav
trytond.webdav.register()
import trytond.test
trytond.test.register()
import trytond.tests
trytond.tests.register()
logger = logging.getLogger('modules')
for package in create_graph(get_module_list())[0]:
module = package.name
logger.info('%s:registering classes' % module)
if module in ('ir', 'res', 'webdav', 'test'):
if module in ('ir', 'res', 'webdav', 'tests'):
MODULES.append(module)
continue
@@ -375,7 +375,7 @@ def load_modules(database_name, pool, update=False, lang=None):
where=(ir_module.name == 'workflow')))
if 'all' in CONFIG['init']:
cursor.execute(*ir_module.select(ir_module.name,
where=(ir_module.name != 'test')))
where=(ir_module.name != 'tests')))
else:
cursor.execute(*ir_module.select(ir_module.name,
where=ir_module.state.in_(('installed', 'to install',
trytond/test/__init__.py
-138
View File
@@ -1,138 +0,0 @@
#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 ..pool import Pool
from .test import *
from .model import *
from .mptt import *
from .import_data import *
from .export_data import *
from .trigger import *
from .access import *
from .wizard import *
from .workflow import *
from .copy import *
def register():
Pool.register(
Boolean,
BooleanDefault,
Integer,
IntegerDefault,
IntegerRequired,
Float,
FloatDefault,
FloatRequired,
FloatDigits,
Numeric,
NumericDefault,
NumericRequired,
NumericDigits,
Char,
CharDefault,
CharRequired,
CharSize,
CharTranslate,
Text,
TextDefault,
TextRequired,
TextSize,
TextTranslate,
Sha,
ShaDefault,
ShaRequired,
Date,
DateDefault,
DateRequired,
DateTime,
DateTimeDefault,
DateTimeRequired,
DateTimeFormat,
Time,
TimeDefault,
TimeRequired,
TimeFormat,
One2One,
One2OneTarget,
One2OneRelation,
One2OneRequired,
One2OneRequiredRelation,
One2OneDomain,
One2OneDomainRelation,
One2Many,
One2ManyTarget,
One2ManyRequired,
One2ManyRequiredTarget,
One2ManyReference,
One2ManyReferenceTarget,
One2ManySize,
One2ManySizeTarget,
One2ManySizePYSON,
One2ManySizePYSONTarget,
Many2Many,
Many2ManyTarget,
Many2ManyRelation,
Many2ManyRequired,
Many2ManyRequiredTarget,
Many2ManyRequiredRelation,
Many2ManyReference,
Many2ManyReferenceTarget,
Many2ManyReferenceRelation,
Many2ManySize,
Many2ManySizeTarget,
Many2ManySizeRelation,
Reference,
ReferenceTarget,
ReferenceRequired,
Property,
Selection,
SelectionRequired,
Dict,
DictDefault,
DictRequired,
Binary,
BinaryDefault,
BinaryRequired,
Singleton,
URLObject,
ModelSQLRequiredField,
MPTT,
ImportDataBoolean,
ImportDataInteger,
ImportDataIntegerRequired,
ImportDataFloat,
ImportDataFloatRequired,
ImportDataNumeric,
ImportDataNumericRequired,
ImportDataChar,
ImportDataText,
ImportDataSha,
ImportDataDate,
ImportDataDateTime,
ImportDataSelection,
ImportDataMany2OneTarget,
ImportDataMany2One,
ImportDataMany2ManyTarget,
ImportDataMany2Many,
ImportDataMany2ManyRelation,
ImportDataOne2Many,
ImportDataOne2ManyTarget,
ImportDataReferenceSelection,
ImportDataReference,
ExportDataTarget,
ExportData,
ExportDataTarget2,
ExportDataRelation,
Triggered,
TriggerAction,
TestAccess,
TestWizardStart,
WorkflowedModel,
CopyOne2Many,
CopyOne2ManyTarget,
CopyOne2ManyReference,
CopyOne2ManyReferenceTarget,
module='test', type_='model')
Pool.register(
TestWizard,
module='test', type_='wizard')
trytond/tests/__init__.py
+141 -1
View File
@@ -1,4 +1,144 @@
#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 .test_tryton import all_suite as suite
from ..pool import Pool
from .test import *
from .model import *
from .mptt import *
from .import_data import *
from .export_data import *
from .trigger import *
from .access import *
from .wizard import *
from .workflow import *
from .copy_ import *
def register():
Pool.register(
Boolean,
BooleanDefault,
Integer,
IntegerDefault,
IntegerRequired,
Float,
FloatDefault,
FloatRequired,
FloatDigits,
Numeric,
NumericDefault,
NumericRequired,
NumericDigits,
Char,
CharDefault,
CharRequired,
CharSize,
CharTranslate,
Text,
TextDefault,
TextRequired,
TextSize,
TextTranslate,
Sha,
ShaDefault,
ShaRequired,
Date,
DateDefault,
DateRequired,
DateTime,
DateTimeDefault,
DateTimeRequired,
DateTimeFormat,
Time,
TimeDefault,
TimeRequired,
TimeFormat,
One2One,
One2OneTarget,
One2OneRelation,
One2OneRequired,
One2OneRequiredRelation,
One2OneDomain,
One2OneDomainRelation,
One2Many,
One2ManyTarget,
One2ManyRequired,
One2ManyRequiredTarget,
One2ManyReference,
One2ManyReferenceTarget,
One2ManySize,
One2ManySizeTarget,
One2ManySizePYSON,
One2ManySizePYSONTarget,
Many2Many,
Many2ManyTarget,
Many2ManyRelation,
Many2ManyRequired,
Many2ManyRequiredTarget,
Many2ManyRequiredRelation,
Many2ManyReference,
Many2ManyReferenceTarget,
Many2ManyReferenceRelation,
Many2ManySize,
Many2ManySizeTarget,
Many2ManySizeRelation,
Reference,
ReferenceTarget,
ReferenceRequired,
Property,
Selection,
SelectionRequired,
Dict,
DictDefault,
DictRequired,
Binary,
BinaryDefault,
BinaryRequired,
Singleton,
URLObject,
ModelSQLRequiredField,
MPTT,
ImportDataBoolean,
ImportDataInteger,
ImportDataIntegerRequired,
ImportDataFloat,
ImportDataFloatRequired,
ImportDataNumeric,
ImportDataNumericRequired,
ImportDataChar,
ImportDataText,
ImportDataSha,
ImportDataDate,
ImportDataDateTime,
ImportDataSelection,
ImportDataMany2OneTarget,
ImportDataMany2One,
ImportDataMany2ManyTarget,
ImportDataMany2Many,
ImportDataMany2ManyRelation,
ImportDataOne2Many,
ImportDataOne2ManyTarget,
ImportDataReferenceSelection,
ImportDataReference,
ExportDataTarget,
ExportData,
ExportDataTarget2,
ExportDataRelation,
Triggered,
TriggerAction,
TestAccess,
TestWizardStart,
WorkflowedModel,
CopyOne2Many,
CopyOne2ManyTarget,
CopyOne2ManyReference,
CopyOne2ManyReferenceTarget,
module='tests', type_='model')
Pool.register(
TestWizard,
module='tests', type_='wizard')
def suite():
from .test_tryton import all_suite
return all_suite()
trytond/test/access.py → trytond/tests/access.py
View File
trytond/test/copy.py → trytond/tests/copy_.py
View File
trytond/test/export_data.py → trytond/tests/export_data.py
View File
trytond/test/import_data.py → trytond/tests/import_data.py
View File
trytond/test/import_data.xml → trytond/tests/import_data.xml
View File
trytond/test/model.py → trytond/tests/model.py
View File
trytond/test/mptt.py → trytond/tests/mptt.py
View File
trytond/test/sequence.xml → trytond/tests/sequence.xml
View File
trytond/test/test.py → trytond/tests/test.py
View File
trytond/tests/test_access.py
+2 -2
View File
@@ -14,7 +14,7 @@ class ModelAccessTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.model_access = POOL.get('ir.model.access')
self.test_access = POOL.get('test.access')
self.model = POOL.get('ir.model')
@@ -359,7 +359,7 @@ class ModelFieldAccessTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.field_access = POOL.get('ir.model.field.access')
self.test_access = POOL.get('test.access')
self.field = POOL.get('ir.model.field')
trytond/tests/test_copy.py
+1 -1
View File
@@ -14,7 +14,7 @@ class CopyTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.one2many = POOL.get('test.copy.one2many')
self.one2many_target = POOL.get('test.copy.one2many.target')
self.one2many_reference = POOL.get('test.copy.one2many_reference')
trytond/tests/test_exportdata.py
+1 -1
View File
@@ -24,7 +24,7 @@ class ExportDataTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.export_data = POOL.get('test.export_data')
self.export_data_target = POOL.get('test.export_data.target')
self.export_data_relation = POOL.get('test.export_data.relation')
trytond/tests/test_fields.py
+1 -1
View File
@@ -24,7 +24,7 @@ class FieldsTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.boolean = POOL.get('test.boolean')
self.boolean_default = POOL.get('test.boolean_default')
trytond/tests/test_importdata.py
+7 -7
View File
@@ -14,7 +14,7 @@ class ImportDataTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.boolean = POOL.get('test.import_data.boolean')
self.integer = POOL.get('test.import_data.integer')
self.integer_required = POOL.get('test.import_data.integer_required')
@@ -376,7 +376,7 @@ class ImportDataTestCase(unittest.TestCase):
[['Test']]), (1, 0, 0, 0))
self.assertEqual(self.many2one.import_data(['many2one:id'],
[['test.import_data_many2one_target_test']]), (1, 0, 0, 0))
[['tests.import_data_many2one_target_test']]), (1, 0, 0, 0))
self.assertEqual(self.many2one.import_data(['many2one'],
[['']]), (1, 0, 0, 0))
@@ -394,7 +394,7 @@ class ImportDataTestCase(unittest.TestCase):
[['foo']])[0], -1)
self.assertEqual(self.many2one.import_data(['many2one:id'],
[['test.foo']])[0], -1)
[['tests.foo']])[0], -1)
transaction.cursor.rollback()
@@ -408,14 +408,14 @@ class ImportDataTestCase(unittest.TestCase):
[['Test 1']]), (1, 0, 0, 0))
self.assertEqual(self.many2many.import_data(['many2many:id'],
[['test.import_data_many2many_target_test1']]), (1, 0, 0, 0))
[['tests.import_data_many2many_target_test1']]), (1, 0, 0, 0))
self.assertEqual(self.many2many.import_data(['many2many'],
[['Test 1,Test 2']]), (1, 0, 0, 0))
self.assertEqual(self.many2many.import_data(['many2many:id'],
[['test.import_data_many2many_target_test1,'
'test.import_data_many2many_target_test2']]),
[['tests.import_data_many2many_target_test1,'
'tests.import_data_many2many_target_test2']]),
(1, 0, 0, 0))
self.assertEqual(self.many2many.import_data(['many2many'],
@@ -485,7 +485,7 @@ class ImportDataTestCase(unittest.TestCase):
self.assertEqual(self.reference.import_data(['reference:id'],
[['test.import_data.reference.selection,'
'test.import_data_reference_selection_test']]),
'tests.import_data_reference_selection_test']]),
(1, 0, 0, 0))
reference, = self.reference.search([])
self.assertEqual(reference.reference.__name__,
trytond/tests/test_mixins.py
+1 -1
View File
@@ -16,7 +16,7 @@ class UrlTestCase(unittest.TestCase):
"Test URL generation"
def setUp(self):
install_module('test')
install_module('tests')
self.urlmodel = POOL.get('test.urlobject')
self.urlwizard = POOL.get('test.test_wizard', type='wizard')
self.hostname = HOSTNAME
trytond/tests/test_modelsingleton.py
+1 -1
View File
@@ -15,7 +15,7 @@ class ModelSingletonTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.singleton = POOL.get('test.singleton')
def test0010read(self):
trytond/tests/test_modelsql.py
+1 -1
View File
@@ -18,7 +18,7 @@ class ModelSQLTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.modelsql = POOL.get('test.modelsql')
def test0010required_field_missing(self):
trytond/tests/test_mptt.py
+1 -1
View File
@@ -15,7 +15,7 @@ class MPTTTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.mptt = POOL.get('test.mptt')
def CheckTree(self, parent_id=None, left=-1, right=sys.maxint):
trytond/tests/test_sequence.py
+1 -1
View File
@@ -15,7 +15,7 @@ class SequenceTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.sequence = POOL.get('ir.sequence')
def test0010incremental(self):
trytond/tests/test_transaction.py
+1 -1
View File
@@ -34,7 +34,7 @@ class TransactionTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
def test0010nonexistdb(self):
'''
trytond/tests/test_trigger.py
+2 -2
View File
@@ -27,7 +27,7 @@ except ImportError:
yield tuple(pool[i] for i in indices)
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, \
install_module
from trytond.test.trigger import TRIGGER_LOGS
from trytond.tests.trigger import TRIGGER_LOGS
from trytond.transaction import Transaction
@@ -37,7 +37,7 @@ class TriggerTestCase(unittest.TestCase):
'''
def setUp(self):
install_module('test')
install_module('tests')
self.triggered = POOL.get('test.triggered')
self.trigger = POOL.get('ir.trigger')
self.trigger_log = POOL.get('ir.trigger.log')
trytond/tests/test_wizard.py
+1 -1
View File
@@ -9,7 +9,7 @@ from trytond.transaction import Transaction
class WizardTestCase(unittest.TestCase):
def setUp(self):
install_module('test')
install_module('tests')
self.wizard = POOL.get('test.test_wizard', type='wizard')
self.session = POOL.get('ir.session.wizard')
self.group = POOL.get('res.group')
trytond/tests/test_workflow.py
+1 -1
View File
@@ -11,7 +11,7 @@ from trytond.tests.test_tryton import (POOL, DB_NAME, USER, CONTEXT,
class WorkflowTestCase(unittest.TestCase):
def setUp(self):
install_module('test')
install_module('tests')
self.workflow = POOL.get('test.workflowed')
# TODO add test for Workflow.transition
trytond/test/trigger.py → trytond/tests/trigger.py
View File
trytond/test/tryton.cfg → trytond/tests/tryton.cfg
View File
trytond/test/wizard.py → trytond/tests/wizard.py
+1 -1
View File
@@ -26,7 +26,7 @@ class TestWizard(Wizard):
'Test Wizard'
__name__ = 'test.test_wizard'
start = StateView('test.test_wizard.start',
'test.test_wizard_start_view_form', [
'tests.test_wizard_start_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
Button('Next', 'next_', 'tryton-next', default=True),
])
trytond/test/wizard.xml → trytond/tests/wizard.xml
View File
trytond/test/workflow.py → trytond/tests/workflow.py
View File
trytond/test/workflow.xml → trytond/tests/workflow.xml
View File
trytond/tools/misc.py
+1 -1
View File
@@ -110,7 +110,7 @@ def file_open(name, mode="r", subdir='modules'):
and (name.startswith('ir' + os.sep)
or name.startswith('res' + os.sep)
or name.startswith('webdav' + os.sep)
or name.startswith('test' + os.sep))):
or name.startswith('tests' + os.sep))):
name = os.path.join(root_path, name)
else:
name = os.path.join(root_path, subdir, name)