Enable running unit test and coverage in py3.
- Migrate run_tests.sh to python3
- Running run_tests.sh in py2 is not supported.
Bug: 157392770
Test: ./run_test.sh
./run_test_py2.sh
atest --host acloud_test
atest --host acloud_test_py3
Change-Id: Ibf6a535f36c9ebd196b075eed092c10992f338eb
diff --git a/setup/gcp_setup_runner_test.py b/setup/gcp_setup_runner_test.py
index fa12d1f..7e4dac4 100644
--- a/setup/gcp_setup_runner_test.py
+++ b/setup/gcp_setup_runner_test.py
@@ -19,7 +19,6 @@
import os
import mock
import six
-from six import b
# pylint: disable=no-name-in-module,import-error,no-member
from acloud import errors
@@ -28,7 +27,7 @@
from acloud.public import config
from acloud.setup import gcp_setup_runner
-_GCP_USER_CONFIG = b("""
+_GCP_USER_CONFIG = """
[compute]
region = new_region
zone = new_zone
@@ -36,8 +35,7 @@
account = new@google.com
disable_usage_reporting = False
project = new_project
-""")
-
+"""
def _CreateCfgFile():
"""A helper method that creates a mock configuration object."""
@@ -147,7 +145,7 @@
@mock.patch.object(gcp_setup_runner, "GoogleSDKBins")
def testSetupGcloudInfo(self, mock_sdk, mock_set, mock_run, mock_create):
"""test setup gcloud info"""
- with mock.patch("google_sdk.GoogleSDK"):
+ with mock.patch("acloud.setup.google_sdk.GoogleSDK"):
self.gcp_env_runner._SetupGcloudInfo()
mock_sdk.assert_called_once()
mock_set.assert_called_once()