From 9ddcc6ef45bdb138d0a94b31bbf7217d58404fd2 Mon Sep 17 00:00:00 2001 From: Matthew Poletiek Date: Sat, 19 Dec 2020 23:40:56 -0600 Subject: Fixing Tox for Testing --- tests/unit/base.py | 10 ++++++---- tests/unit/test_memedit_edits.py | 11 +++++++---- tests/unit/test_platform.py | 12 ++++++++---- tests/unit/test_shiftdialog.py | 11 +++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/base.py b/tests/unit/base.py index 1e112ce..65f2eee 100644 --- a/tests/unit/base.py +++ b/tests/unit/base.py @@ -3,10 +3,12 @@ import unittest import mock -try: - import mox -except ImportError: - from mox3 import mox +from mox3 import mox + +#try: +# import mox3 +#except ImportError: +# from mox3 import mox import warnings warnings.simplefilter('ignore', Warning) diff --git a/tests/unit/test_memedit_edits.py b/tests/unit/test_memedit_edits.py index fdf971c..167f467 100644 --- a/tests/unit/test_memedit_edits.py +++ b/tests/unit/test_memedit_edits.py @@ -1,7 +1,10 @@ -try: - import mox -except ImportError: - from mox3 import mox +from mox3 import mox + +#try: +# import mox3 +#except ImportError: +# from mox3 import mox + from tests.unit import base __builtins__["_"] = lambda s: s diff --git a/tests/unit/test_platform.py b/tests/unit/test_platform.py index 394f894..3dbca47 100644 --- a/tests/unit/test_platform.py +++ b/tests/unit/test_platform.py @@ -14,10 +14,14 @@ # along with this program. If not, see . import unittest -try: - import mox -except ImportError: - from mox3 import mox + +from mox3 import mox + +#try: +# import mox3 +#except ImportError: +# from mox3 import mox + import os from tests.unit import base diff --git a/tests/unit/test_shiftdialog.py b/tests/unit/test_shiftdialog.py index fe0b62d..d146e4d 100644 --- a/tests/unit/test_shiftdialog.py +++ b/tests/unit/test_shiftdialog.py @@ -1,8 +1,11 @@ import unittest -try: - import mox -except ImportError: - from mox3 import mox + +from mox3 import mox + +#try: +# import mox3 +#except ImportError: +# from mox3 import mox from tests.unit import base from chirp import chirp_common -- cgit v1.2.3