From b1ce73437f22360c1ec6aee45edcc044bb3233dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 12 Mar 2010 17:49:35 +0100 Subject: [PATCH] Add test_suite in setup.py --- setup.py | 3 +++ tests/__init__.py | 2 +- tests/test_company.py | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index cfa3e01b1b..fbd654b31a 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,7 @@ setup(name='trytond_company', package_dir={'trytond.modules.company': '.'}, packages=[ 'trytond.modules.company', + 'trytond.modules.company.tests', ], package_data={ 'trytond.modules.company': info.get('xml', []) \ @@ -59,4 +60,6 @@ setup(name='trytond_company', [trytond.modules] company = trytond.modules.company """, + test_suite='tests', + test_loader='trytond.test_loader:Loader', ) diff --git a/tests/__init__.py b/tests/__init__.py index 82283ac2f8..31b9c4ab8e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ #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_company import * +from test_company import suite diff --git a/tests/test_company.py b/tests/test_company.py index da66273a68..680c91ae23 100644 --- a/tests/test_company.py +++ b/tests/test_company.py @@ -2,9 +2,6 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import logging -logging.basicConfig(level=logging.FATAL) - import sys, os DIR = os.path.abspath(os.path.normpath(os.path.join(__file__, '..', '..', '..', '..', '..', 'trytond')))