From a05df92027c4905c48f4acdeadc94985fe0c8bb3 Mon Sep 17 00:00:00 2001 From: "Eric Lin (Tzu Hsiang Lin)" Date: Mon, 15 Feb 2021 18:52:51 +0800 Subject: Drop the py2 compatibility in unittest usages. (#726) --- .../mobly/controllers/android_device_lib/services/base_service_test.py | 3 ++- tests/mobly/controllers/android_device_lib/services/logcat_test.py | 3 +-- .../mobly/controllers/android_device_lib/services/sl4a_service_test.py | 2 +- .../android_device_lib/services/snippet_management_service_test.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/mobly/controllers/android_device_lib/services') 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 -- cgit v1.2.3