From f72767bb6cc3b74723772cd95dbfc5a32bb98afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Jun 2018 19:59:01 +0200 Subject: [PATCH] Remove mock from tests requirements --- setup.py | 1 - tox.ini | 1 - trytond/tests/test_user.py | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 7f7c8c6fd5..ddf71f4c73 100644 --- a/setup.py +++ b/setup.py @@ -116,5 +116,4 @@ setup(name=name, zip_safe=False, test_suite='trytond.tests', test_loader='trytond.test_loader:Loader', - tests_require=['mock'], ) diff --git a/tox.ini b/tox.ini index 16208608a7..5212a413de 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ envlist = {py34,py35,py36}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - mock {py34,py35,py36}-postgresql: psycopg2 >= 2.5 pypy3-postgresql: psycopg2cffi >= 2.5 sqlite: sqlitebck diff --git a/trytond/tests/test_user.py b/trytond/tests/test_user.py index 547c56dc6f..d335606b6b 100644 --- a/trytond/tests/test_user.py +++ b/trytond/tests/test_user.py @@ -3,10 +3,7 @@ import datetime import os import unittest -try: - from unittest.mock import patch, ANY -except ImportError: - from mock import patch, ANY +from unittest.mock import patch, ANY from trytond.tests.test_tryton import activate_module, with_transaction from trytond.pool import Pool