[python3 migration] remove py-mock: import mock from unittest
use from unittest import mock instead of import mock
and remove py-mock libs from Android.bp
BUG: 137195528
Test: atest acloud_test --host
Change-Id: I349e7b5c184f2271402b73804d025db981f18dd5
diff --git a/Android.bp b/Android.bp
index c9191c5..b0ab7d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,7 +115,6 @@
"py-apitools",
"py-dateutil",
"py-google-api-python-client",
- "py-mock",
"py-oauth2client",
],
test_config: "acloud_unittest.xml",
diff --git a/create/avd_spec_test.py b/create/avd_spec_test.py
index c608344..ee5e3a4 100644
--- a/create/avd_spec_test.py
+++ b/create/avd_spec_test.py
@@ -17,7 +17,8 @@
import os
import subprocess
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.create import avd_spec
diff --git a/create/cheeps_remote_image_remote_instance_test.py b/create/cheeps_remote_image_remote_instance_test.py
index 2b0bba2..17d917e 100644
--- a/create/cheeps_remote_image_remote_instance_test.py
+++ b/create/cheeps_remote_image_remote_instance_test.py
@@ -2,7 +2,7 @@
import unittest
import uuid
-import mock
+from unittest import mock
from acloud.create import cheeps_remote_image_remote_instance
from acloud.internal import constants
diff --git a/create/create_args_test.py b/create/create_args_test.py
index 997f9f3..94886fe 100644
--- a/create/create_args_test.py
+++ b/create/create_args_test.py
@@ -14,7 +14,8 @@
"""Tests for create."""
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.create import create_args
diff --git a/create/create_common_test.py b/create/create_common_test.py
index 0cfaea7..0c8de70 100644
--- a/create/create_common_test.py
+++ b/create/create_common_test.py
@@ -18,7 +18,7 @@
import tempfile
import unittest
-import mock
+from unittest import mock
from acloud import errors
from acloud.create import create_common
diff --git a/create/create_test.py b/create/create_test.py
index 6b09c3d..7ab4b27 100644
--- a/create/create_test.py
+++ b/create/create_test.py
@@ -16,7 +16,8 @@
import os
import subprocess
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.create import avd_spec
diff --git a/create/goldfish_local_image_local_instance_test.py b/create/goldfish_local_image_local_instance_test.py
index 75c8004..eee62f1 100644
--- a/create/goldfish_local_image_local_instance_test.py
+++ b/create/goldfish_local_image_local_instance_test.py
@@ -17,7 +17,8 @@
import shutil
import tempfile
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
import acloud.create.goldfish_local_image_local_instance as instance_module
diff --git a/create/local_image_local_instance_test.py b/create/local_image_local_instance_test.py
index 24eb5f8..5279145 100644
--- a/create/local_image_local_instance_test.py
+++ b/create/local_image_local_instance_test.py
@@ -19,7 +19,8 @@
import subprocess
import tempfile
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.create import local_image_local_instance
diff --git a/create/remote_image_local_instance_test.py b/create/remote_image_local_instance_test.py
index 0a64a96..7c5adc7 100644
--- a/create/remote_image_local_instance_test.py
+++ b/create/remote_image_local_instance_test.py
@@ -17,7 +17,8 @@
from collections import namedtuple
import os
import subprocess
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.create import remote_image_local_instance
@@ -72,6 +73,7 @@
"""Test process remote cuttlefish image."""
avd_spec = mock.MagicMock()
avd_spec.cfg = mock.MagicMock()
+ avd_spec.cfg.creds_cache_file = "cache.file"
avd_spec.remote_image = self._fake_remote_image
avd_spec.image_download_dir = "/tmp"
self.Patch(os.path, "exists", return_value=False)
diff --git a/delete/delete_test.py b/delete/delete_test.py
index 3d5e8ff..1d7f97f 100644
--- a/delete/delete_test.py
+++ b/delete/delete_test.py
@@ -15,7 +15,8 @@
import subprocess
import unittest
-import mock
+
+from unittest import mock
from acloud.delete import delete
from acloud.internal.lib import driver_test_lib
diff --git a/internal/lib/adb_tools_test.py b/internal/lib/adb_tools_test.py
index 94809a7..2015ab9 100644
--- a/internal/lib/adb_tools_test.py
+++ b/internal/lib/adb_tools_test.py
@@ -15,8 +15,9 @@
import subprocess
import unittest
+
+from unittest import mock
from six import b
-import mock
from acloud import errors
from acloud.internal.lib import adb_tools
diff --git a/internal/lib/android_build_client_test.py b/internal/lib/android_build_client_test.py
index 91a933e..0aeeb44 100644
--- a/internal/lib/android_build_client_test.py
+++ b/internal/lib/android_build_client_test.py
@@ -20,7 +20,8 @@
import time
import unittest
-import mock
+
+from unittest import mock
import six
import apiclient
diff --git a/internal/lib/android_compute_client_test.py b/internal/lib/android_compute_client_test.py
index 0c30e8b..56c6041 100644
--- a/internal/lib/android_compute_client_test.py
+++ b/internal/lib/android_compute_client_test.py
@@ -15,7 +15,8 @@
# limitations under the License.
"""Tests for android_compute_client."""
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal.lib import android_compute_client
diff --git a/internal/lib/base_cloud_client_test.py b/internal/lib/base_cloud_client_test.py
index 60cc1b5..fc75358 100644
--- a/internal/lib/base_cloud_client_test.py
+++ b/internal/lib/base_cloud_client_test.py
@@ -19,7 +19,8 @@
import time
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal.lib import base_cloud_client
diff --git a/internal/lib/cheeps_compute_client_test.py b/internal/lib/cheeps_compute_client_test.py
index 9342045..73ded3e 100644
--- a/internal/lib/cheeps_compute_client_test.py
+++ b/internal/lib/cheeps_compute_client_test.py
@@ -16,7 +16,8 @@
"""Tests for acloud.internal.lib.cheeps_compute_client."""
import unittest
-import mock
+
+from unittest import mock
from acloud.internal import constants
from acloud.internal.lib import cheeps_compute_client
diff --git a/internal/lib/cvd_compute_client_multi_stage_test.py b/internal/lib/cvd_compute_client_multi_stage_test.py
index 1c1776b..eedf47f 100644
--- a/internal/lib/cvd_compute_client_multi_stage_test.py
+++ b/internal/lib/cvd_compute_client_multi_stage_test.py
@@ -20,7 +20,8 @@
import os
import subprocess
import unittest
-import mock
+
+from unittest import mock
from acloud.create import avd_spec
from acloud.internal import constants
diff --git a/internal/lib/cvd_compute_client_test.py b/internal/lib/cvd_compute_client_test.py
index 8b2fa26..7b764c6 100644
--- a/internal/lib/cvd_compute_client_test.py
+++ b/internal/lib/cvd_compute_client_test.py
@@ -18,7 +18,8 @@
import glob
import unittest
-import mock
+
+from unittest import mock
from acloud.create import avd_spec
from acloud.internal import constants
diff --git a/internal/lib/cvd_runtime_config_test.py b/internal/lib/cvd_runtime_config_test.py
index 060307a..a7cf8d2 100644
--- a/internal/lib/cvd_runtime_config_test.py
+++ b/internal/lib/cvd_runtime_config_test.py
@@ -17,7 +17,8 @@
import os
import unittest
-import mock
+
+from unittest import mock
import six
from acloud.internal.lib import cvd_runtime_config as cf_cfg
diff --git a/internal/lib/driver_test_lib.py b/internal/lib/driver_test_lib.py
index a9f212c..339a8fc 100644
--- a/internal/lib/driver_test_lib.py
+++ b/internal/lib/driver_test_lib.py
@@ -15,7 +15,8 @@
# limitations under the License.
"""Driver test library."""
import unittest
-import mock
+
+from unittest import mock
class BaseDriverTest(unittest.TestCase):
diff --git a/internal/lib/gcompute_client_test.py b/internal/lib/gcompute_client_test.py
index 8578867..aab1c3a 100644
--- a/internal/lib/gcompute_client_test.py
+++ b/internal/lib/gcompute_client_test.py
@@ -20,7 +20,8 @@
import os
import unittest
-import mock
+
+from unittest import mock
import six
# pylint: disable=import-error
diff --git a/internal/lib/goldfish_compute_client_test.py b/internal/lib/goldfish_compute_client_test.py
index c627f6d..bdfc119 100644
--- a/internal/lib/goldfish_compute_client_test.py
+++ b/internal/lib/goldfish_compute_client_test.py
@@ -15,7 +15,8 @@
# limitations under the License.
"""Tests for acloud.internal.lib.goldfish_compute_client."""
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import driver_test_lib
from acloud.internal.lib import gcompute_client
diff --git a/internal/lib/gstorage_client_test.py b/internal/lib/gstorage_client_test.py
index e2426e1..600d20e 100644
--- a/internal/lib/gstorage_client_test.py
+++ b/internal/lib/gstorage_client_test.py
@@ -4,7 +4,8 @@
import time
import unittest
-import mock
+
+from unittest import mock
import apiclient
diff --git a/internal/lib/local_instance_lock_test.py b/internal/lib/local_instance_lock_test.py
index 0f62ed3..047171f 100644
--- a/internal/lib/local_instance_lock_test.py
+++ b/internal/lib/local_instance_lock_test.py
@@ -20,7 +20,8 @@
import shutil
import tempfile
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal.lib import local_instance_lock
diff --git a/internal/lib/ota_tools_test.py b/internal/lib/ota_tools_test.py
index 9e32af3..97dc4bc 100644
--- a/internal/lib/ota_tools_test.py
+++ b/internal/lib/ota_tools_test.py
@@ -17,7 +17,8 @@
import shutil
import tempfile
import unittest
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal.lib import ota_tools
diff --git a/internal/lib/ssh_test.py b/internal/lib/ssh_test.py
index b101d93..f6268fe 100644
--- a/internal/lib/ssh_test.py
+++ b/internal/lib/ssh_test.py
@@ -20,7 +20,8 @@
import unittest
import threading
import time
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal import constants
diff --git a/internal/lib/utils_test.py b/internal/lib/utils_test.py
index 80ab12a..c28f832 100644
--- a/internal/lib/utils_test.py
+++ b/internal/lib/utils_test.py
@@ -27,8 +27,9 @@
import webbrowser
import unittest
+
+from unittest import mock
import six
-import mock
from acloud import errors
from acloud.internal.lib import driver_test_lib
diff --git a/list/instance_test.py b/list/instance_test.py
index 4bc1418..1e03295 100644
--- a/list/instance_test.py
+++ b/list/instance_test.py
@@ -19,12 +19,13 @@
import datetime
import subprocess
import unittest
+
+from unittest import mock
from six import b
# pylint: disable=import-error
import dateutil.parser
import dateutil.tz
-import mock
from acloud.internal import constants
from acloud.internal.lib import cvd_runtime_config
diff --git a/list/list_test.py b/list/list_test.py
index 057bafd..b9077a6 100644
--- a/list/list_test.py
+++ b/list/list_test.py
@@ -15,7 +15,7 @@
import unittest
-import mock
+from unittest import mock
from acloud import errors
from acloud.internal.lib import cvd_runtime_config
diff --git a/public/acloud_kernel/kernel_swapper_test.py b/public/acloud_kernel/kernel_swapper_test.py
index dabe4a9..cf4cfb5 100644
--- a/public/acloud_kernel/kernel_swapper_test.py
+++ b/public/acloud_kernel/kernel_swapper_test.py
@@ -18,7 +18,8 @@
import subprocess
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import android_compute_client
from acloud.internal.lib import auth
diff --git a/public/actions/common_operations_test.py b/public/actions/common_operations_test.py
index c1cdd6c..874b54b 100644
--- a/public/actions/common_operations_test.py
+++ b/public/actions/common_operations_test.py
@@ -20,7 +20,8 @@
import shlex
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import android_build_client
from acloud.internal.lib import android_compute_client
diff --git a/public/actions/create_cuttlefish_action_test.py b/public/actions/create_cuttlefish_action_test.py
index c763bb8..cce7963 100644
--- a/public/actions/create_cuttlefish_action_test.py
+++ b/public/actions/create_cuttlefish_action_test.py
@@ -21,7 +21,8 @@
import uuid
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import android_build_client
from acloud.internal.lib import android_compute_client
diff --git a/public/actions/create_goldfish_action_test.py b/public/actions/create_goldfish_action_test.py
index 981a353..4e71a93 100644
--- a/public/actions/create_goldfish_action_test.py
+++ b/public/actions/create_goldfish_action_test.py
@@ -16,7 +16,8 @@
"""Tests for acloud.public.actions.create_goldfish_actions."""
import uuid
import unittest
-import mock
+
+from unittest import mock
from acloud.internal import constants
from acloud.internal.lib import android_build_client
diff --git a/public/actions/remote_instance_cf_device_factory_test.py b/public/actions/remote_instance_cf_device_factory_test.py
index 157a16d..2c89139 100644
--- a/public/actions/remote_instance_cf_device_factory_test.py
+++ b/public/actions/remote_instance_cf_device_factory_test.py
@@ -21,8 +21,9 @@
import unittest
import uuid
+from unittest import mock
+
import six
-import mock
from acloud.create import avd_spec
from acloud.internal import constants
@@ -419,12 +420,14 @@
self.Patch(shutil, "rmtree")
fake_avd_spec = mock.MagicMock()
fake_avd_spec.cfg = mock.MagicMock()
+ fake_avd_spec.cfg.creds_cache_file = "cache.file"
fake_avd_spec.remote_image = fake_remote_image
fake_avd_spec.image_download_dir = "/tmp"
self.Patch(os.path, "exists", return_value=False)
self.Patch(os, "makedirs")
factory = remote_instance_cf_device_factory.RemoteInstanceDeviceFactory(
fake_avd_spec)
+
factory._DownloadArtifacts(extract_path)
self.assertEqual(mock_check_call.call_count, 1)
@@ -446,6 +449,8 @@
fake_avd_spec.instance_type = constants.INSTANCE_TYPE_HOST
fake_avd_spec.image_source = constants.IMAGE_SRC_LOCAL
fake_avd_spec._instance_name_to_reuse = None
+ fake_avd_spec.cfg = mock.MagicMock()
+ fake_avd_spec.cfg.creds_cache_file = "cache.file"
fake_host_package_name = "/fake/host_package.tar.gz"
fake_image_name = ""
factory = remote_instance_cf_device_factory.RemoteInstanceDeviceFactory(
diff --git a/public/actions/remote_instance_fvp_device_factory_test.py b/public/actions/remote_instance_fvp_device_factory_test.py
index 4cb46e0..72f3c61 100644
--- a/public/actions/remote_instance_fvp_device_factory_test.py
+++ b/public/actions/remote_instance_fvp_device_factory_test.py
@@ -17,8 +17,9 @@
import os
import unittest
+from unittest import mock
+
import six
-import mock
from acloud.create import avd_spec
from acloud.internal import constants
diff --git a/public/config_test.py b/public/config_test.py
index be57870..356540f 100644
--- a/public/config_test.py
+++ b/public/config_test.py
@@ -18,7 +18,8 @@
import unittest
import os
import tempfile
-import mock
+
+from unittest import mock
import six
diff --git a/public/device_driver_test.py b/public/device_driver_test.py
index 0e86c50..e3c44f2 100644
--- a/public/device_driver_test.py
+++ b/public/device_driver_test.py
@@ -19,7 +19,8 @@
import uuid
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import auth
from acloud.internal.lib import android_build_client
diff --git a/pull/pull_test.py b/pull/pull_test.py
index f57c6c4..b5e7e77 100644
--- a/pull/pull_test.py
+++ b/pull/pull_test.py
@@ -16,7 +16,8 @@
import os
import tempfile
-import mock
+
+from unittest import mock
from acloud import errors
from acloud.internal import constants
diff --git a/reconnect/reconnect_test.py b/reconnect/reconnect_test.py
index e198031..f4228d5 100644
--- a/reconnect/reconnect_test.py
+++ b/reconnect/reconnect_test.py
@@ -17,7 +17,7 @@
import unittest
import subprocess
-import mock
+from unittest import mock
from acloud import errors
from acloud.internal import constants
diff --git a/setup/gcp_setup_runner_test.py b/setup/gcp_setup_runner_test.py
index 7e4dac4..e4a0e92 100644
--- a/setup/gcp_setup_runner_test.py
+++ b/setup/gcp_setup_runner_test.py
@@ -17,7 +17,8 @@
import unittest
import os
-import mock
+
+from unittest import mock
import six
# pylint: disable=no-name-in-module,import-error,no-member
diff --git a/setup/host_setup_runner_test.py b/setup/host_setup_runner_test.py
index 111540e..b98772d 100644
--- a/setup/host_setup_runner_test.py
+++ b/setup/host_setup_runner_test.py
@@ -16,7 +16,8 @@
import shutil
import tempfile
import unittest
-import mock
+
+from unittest import mock
from acloud.internal.lib import driver_test_lib
from acloud.internal.lib import utils