diff options
23 files changed, 29 insertions, 39 deletions
diff --git a/tests/mobly/asserts_test.py b/tests/mobly/asserts_test.py index 6df0bb6..b4eae04 100755 --- a/tests/mobly/asserts_test.py +++ b/tests/mobly/asserts_test.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from future.tests.base import unittest +import unittest from mobly import asserts from mobly import signals diff --git a/tests/mobly/base_instrumentation_test_test.py b/tests/mobly/base_instrumentation_test_test.py index d42b290..96e628a 100755 --- a/tests/mobly/base_instrumentation_test_test.py +++ b/tests/mobly/base_instrumentation_test_test.py @@ -16,8 +16,7 @@ import os import mock import shutil import tempfile - -from future.tests.base import unittest +import unittest from mobly.base_instrumentation_test import _InstrumentationBlock from mobly.base_instrumentation_test import _InstrumentationKnownStatusKeys diff --git a/tests/mobly/base_test_test.py b/tests/mobly/base_test_test.py index a0a2049..f5b9bfb 100755 --- a/tests/mobly/base_test_test.py +++ b/tests/mobly/base_test_test.py @@ -19,10 +19,9 @@ import os import mock import shutil import tempfile +import unittest import yaml -from future.tests.base import unittest - from mobly import asserts from mobly import base_test from mobly import config_parser diff --git a/tests/mobly/controller_manager_test.py b/tests/mobly/controller_manager_test.py index e100bb9..b94e9fd 100755 --- a/tests/mobly/controller_manager_test.py +++ b/tests/mobly/controller_manager_test.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. """Unit tests for controller manager.""" -import mock -from future.tests.base import unittest +import mock +import unittest from mobly import controller_manager from mobly import signals diff --git a/tests/mobly/controllers/android_device_lib/adb_test.py b/tests/mobly/controllers/android_device_lib/adb_test.py index 099cff0..00eea71 100755 --- a/tests/mobly/controllers/android_device_lib/adb_test.py +++ b/tests/mobly/controllers/android_device_lib/adb_test.py @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +import collections import io import mock import subprocess +import unittest -from collections import OrderedDict -from future.tests.base import unittest from mobly.controllers.android_device_lib import adb # Mock parameters for instrumentation. MOCK_INSTRUMENTATION_PACKAGE = 'com.my.instrumentation.tests' MOCK_INSTRUMENTATION_RUNNER = 'com.my.instrumentation.runner' -MOCK_INSTRUMENTATION_OPTIONS = OrderedDict([ +MOCK_INSTRUMENTATION_OPTIONS = collections.OrderedDict([ ('option1', 'value1'), ('option2', 'value2'), ]) diff --git a/tests/mobly/controllers/android_device_lib/callback_handler_test.py b/tests/mobly/controllers/android_device_lib/callback_handler_test.py index 5307fb1..4ab8b5a 100755 --- a/tests/mobly/controllers/android_device_lib/callback_handler_test.py +++ b/tests/mobly/controllers/android_device_lib/callback_handler_test.py @@ -13,7 +13,7 @@ # limitations under the License. import mock -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib import callback_handler from mobly.controllers.android_device_lib import jsonrpc_client_base diff --git a/tests/mobly/controllers/android_device_lib/errors_test.py b/tests/mobly/controllers/android_device_lib/errors_test.py index 213470c..f6cfa50 100755 --- a/tests/mobly/controllers/android_device_lib/errors_test.py +++ b/tests/mobly/controllers/android_device_lib/errors_test.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. """Unit tests for Mobly android_device_lib.errors.""" -import mock -from future.tests.base import unittest +import mock +import unittest from mobly.controllers.android_device_lib import errors diff --git a/tests/mobly/controllers/android_device_lib/jsonrpc_client_base_test.py b/tests/mobly/controllers/android_device_lib/jsonrpc_client_base_test.py index 80f5373..2b3d40d 100755 --- a/tests/mobly/controllers/android_device_lib/jsonrpc_client_base_test.py +++ b/tests/mobly/controllers/android_device_lib/jsonrpc_client_base_test.py @@ -17,7 +17,7 @@ from builtins import str import json import mock import socket -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib import jsonrpc_client_base from tests.lib import jsonrpc_client_test_base diff --git a/tests/mobly/controllers/android_device_lib/jsonrpc_shell_base_test.py b/tests/mobly/controllers/android_device_lib/jsonrpc_shell_base_test.py index 84379d7..1387ad4 100755 --- a/tests/mobly/controllers/android_device_lib/jsonrpc_shell_base_test.py +++ b/tests/mobly/controllers/android_device_lib/jsonrpc_shell_base_test.py @@ -13,17 +13,15 @@ # limitations under the License. import os - import mock -from future.tests.base import unittest +import unittest from mobly.controllers import android_device from mobly.controllers.android_device_lib import jsonrpc_shell_base class JsonRpcClientBaseTest(unittest.TestCase): - """Unit tests for mobly.controllers.android_device_lib.jsonrpc_shell_base. - """ + """Unit tests for mobly.controllers.android_device_lib.jsonrpc_shell_base.""" @mock.patch.object(android_device, 'list_adb_devices') @mock.patch.object(android_device, 'get_instances') diff --git a/tests/mobly/controllers/android_device_lib/service_manager_test.py b/tests/mobly/controllers/android_device_lib/service_manager_test.py index ce02d73..6ceec70 100755 --- a/tests/mobly/controllers/android_device_lib/service_manager_test.py +++ b/tests/mobly/controllers/android_device_lib/service_manager_test.py @@ -15,8 +15,7 @@ import importlib import mock - -from future.tests.base import unittest +import unittest from mobly import expects from mobly.controllers.android_device_lib import service_manager diff --git a/tests/mobly/controllers/android_device_lib/services/base_service_test.py b/tests/mobly/controllers/android_device_lib/services/base_service_test.py index 4fa2c4c..851feb6 100755 --- a/tests/mobly/controllers/android_device_lib/services/base_service_test.py +++ b/tests/mobly/controllers/android_device_lib/services/base_service_test.py @@ -13,7 +13,8 @@ # limitations under the License. import mock -from future.tests.base import unittest +import unittest + from mobly.controllers.android_device_lib.services import base_service diff --git a/tests/mobly/controllers/android_device_lib/services/logcat_test.py b/tests/mobly/controllers/android_device_lib/services/logcat_test.py index 1f36a37..ba18698 100755 --- a/tests/mobly/controllers/android_device_lib/services/logcat_test.py +++ b/tests/mobly/controllers/android_device_lib/services/logcat_test.py @@ -18,8 +18,7 @@ import mock import os import shutil import tempfile - -from future.tests.base import unittest +import unittest from mobly import utils from mobly import runtime_test_info diff --git a/tests/mobly/controllers/android_device_lib/services/sl4a_service_test.py b/tests/mobly/controllers/android_device_lib/services/sl4a_service_test.py index 42ee25c..8977553 100755 --- a/tests/mobly/controllers/android_device_lib/services/sl4a_service_test.py +++ b/tests/mobly/controllers/android_device_lib/services/sl4a_service_test.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import mock -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib.services import sl4a_service from mobly.controllers.android_device_lib import service_manager diff --git a/tests/mobly/controllers/android_device_lib/services/snippet_management_service_test.py b/tests/mobly/controllers/android_device_lib/services/snippet_management_service_test.py index 0be87f7..d086b60 100755 --- a/tests/mobly/controllers/android_device_lib/services/snippet_management_service_test.py +++ b/tests/mobly/controllers/android_device_lib/services/snippet_management_service_test.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import mock -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib.services import snippet_management_service diff --git a/tests/mobly/controllers/android_device_lib/sl4a_client_test.py b/tests/mobly/controllers/android_device_lib/sl4a_client_test.py index 2aff335..edb5a02 100755 --- a/tests/mobly/controllers/android_device_lib/sl4a_client_test.py +++ b/tests/mobly/controllers/android_device_lib/sl4a_client_test.py @@ -16,7 +16,7 @@ from builtins import str from builtins import bytes import mock -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib import adb from mobly.controllers.android_device_lib import jsonrpc_client_base diff --git a/tests/mobly/controllers/android_device_lib/snippet_client_test.py b/tests/mobly/controllers/android_device_lib/snippet_client_test.py index 7b209a0..6dd16f0 100755 --- a/tests/mobly/controllers/android_device_lib/snippet_client_test.py +++ b/tests/mobly/controllers/android_device_lib/snippet_client_test.py @@ -16,7 +16,7 @@ from builtins import str from builtins import bytes import mock -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib import adb from mobly.controllers.android_device_lib import jsonrpc_client_base diff --git a/tests/mobly/controllers/android_device_lib/snippet_event_test.py b/tests/mobly/controllers/android_device_lib/snippet_event_test.py index d105178..05ffcdd 100755 --- a/tests/mobly/controllers/android_device_lib/snippet_event_test.py +++ b/tests/mobly/controllers/android_device_lib/snippet_event_test.py @@ -14,8 +14,7 @@ import logging import time - -from future.tests.base import unittest +import unittest from mobly.controllers.android_device_lib import snippet_event diff --git a/tests/mobly/controllers/android_device_test.py b/tests/mobly/controllers/android_device_test.py index ceea844..9f8a1a9 100755 --- a/tests/mobly/controllers/android_device_test.py +++ b/tests/mobly/controllers/android_device_test.py @@ -21,10 +21,9 @@ import os import shutil import sys import tempfile +import unittest import yaml -from future.tests.base import unittest - from mobly import runtime_test_info from mobly.controllers import android_device from mobly.controllers.android_device_lib import adb diff --git a/tests/mobly/controllers/monsoon_test.py b/tests/mobly/controllers/monsoon_test.py index 37b8150..9fabff0 100755 --- a/tests/mobly/controllers/monsoon_test.py +++ b/tests/mobly/controllers/monsoon_test.py @@ -13,8 +13,7 @@ # limitations under the License. import platform - -from future.tests.base import unittest +import unittest class MonsoonTest(unittest.TestCase): diff --git a/tests/mobly/records_test.py b/tests/mobly/records_test.py index 1197a27..a3c0689 100755 --- a/tests/mobly/records_test.py +++ b/tests/mobly/records_test.py @@ -21,10 +21,9 @@ import os import shutil import tempfile import threading +import unittest import yaml -from future.tests.base import unittest - from mobly import records from mobly import signals diff --git a/tests/mobly/test_runner_test.py b/tests/mobly/test_runner_test.py index 72f0d97..706a520 100755 --- a/tests/mobly/test_runner_test.py +++ b/tests/mobly/test_runner_test.py @@ -19,8 +19,8 @@ import os import re import shutil import tempfile +import unittest import yaml -from future.tests.base import unittest from mobly import config_parser from mobly import records diff --git a/tests/mobly/test_suite_test.py b/tests/mobly/test_suite_test.py index e490876..7dc2b02 100755 --- a/tests/mobly/test_suite_test.py +++ b/tests/mobly/test_suite_test.py @@ -16,8 +16,7 @@ import os import mock import shutil import tempfile - -from future.tests.base import unittest +import unittest from mobly import base_test from mobly import config_parser diff --git a/tests/mobly/utils_test.py b/tests/mobly/utils_test.py index 3b499a6..b95ad6c 100755 --- a/tests/mobly/utils_test.py +++ b/tests/mobly/utils_test.py @@ -24,7 +24,7 @@ import subprocess import tempfile import threading import time -from future.tests.base import unittest +import unittest import portpicker import psutil |