Fixing Tox for Testing

6 files changed, 33 insertions, 20 deletions

diff --git a/tests/run_tests.py b/tests/run_tests.py
index e13fd8c..0331e5e 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -26,6 +26,7 @@ import glob
 import tempfile
 import time
 from optparse import OptionParser
+#import serial
 from serial import Serial
 
 # change to the tests directory
@@ -52,7 +53,7 @@ logger.handle_options(LoggerOpts())
 from chirp import CHIRP_VERSION
 # FIXME: Not all drivers are py3 compatible in syntax, so punt on this
 # until that time, and defer to the safe import loop below.
-# from chirp.drivers import *
+from chirp.drivers import *
 from chirp import chirp_common, directory
 from chirp import import_logic, memmap, settings, errors
 from chirp import settings
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 <http://www.gnu.org/licenses/>.
 
 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
diff --git a/tox.ini b/tox.ini
index 32f367e..dafd59b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = unit,driver,style,py3clean,py3unit,py3driver
 skipsdist = True
 
 [testenv]
-basepython = python2.7
+basepython = python3.7
 sitepackages = True
 passenv = HOME
 whitelist_externals = bash
@@ -40,7 +40,7 @@ commands =
     py3clean chirp tests
 
 [testenv:py3unit]
-basepython = python3
+basepython = python3.7
 sitepackages = False
 setenv =
     PYTHONPATH=../..
@@ -51,7 +51,7 @@ commands =
     pytest --disable-warnings -v tests/unit {posargs}
 
 [testenv:py3driver]
-basepython = python3
+basepython = python3.7
 sitepackages = False
 setenv =
     PYTHONPATH=../..