[Autotest][PY3] Fix import and py3 bin location
Force the py3 bin to by /python3, rather than a wildcard, as the
wildcard can try to run python3.6-config in some instances, which
doesn't work.
BUG=chromium:990593
TEST=test_that 100.107.106.131 infra_ServerPythonVersion.3 --py_version=3
Change-Id: I73fde52e9bd63cc2fd869539171187006b059292
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2806829
Tested-by: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Ruben Zakarian <rzakarian@chromium.org>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
diff --git a/client/common_lib/check_version.py b/client/common_lib/check_version.py
index 7600f66..522f460 100644
--- a/client/common_lib/check_version.py
+++ b/client/common_lib/check_version.py
@@ -5,8 +5,8 @@
import sys
PY_GLOBS = {
- 3: ['/usr/bin/python3*', '/usr/local/bin/python3*'],
- 2: ['/usr/bin/python2*', '/usr/local/bin/python2*']
+ 3: ['/usr/bin/python3', '/usr/local/bin/python3'],
+ 2: ['/usr/bin/python2', '/usr/local/bin/python2']
}
diff --git a/server/hosts/tls_client/autotest_common_pb2.py b/server/hosts/tls_client/autotest_common_pb2.py
index 3bec800..6ad02bd 100644
--- a/server/hosts/tls_client/autotest_common_pb2.py
+++ b/server/hosts/tls_client/autotest_common_pb2.py
@@ -13,7 +13,9 @@
from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from dependencies.longrunning import operations_pb2 as dependencies_dot_longrunning_dot_operations__pb2
+
+import common
+from autotest_lib.server.hosts.tls_client.dependencies.longrunning import operations_pb2 as dependencies_dot_longrunning_dot_operations__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
diff --git a/server/hosts/tls_client/autotest_common_pb2_grpc.py b/server/hosts/tls_client/autotest_common_pb2_grpc.py
index 7737021..6804124 100644
--- a/server/hosts/tls_client/autotest_common_pb2_grpc.py
+++ b/server/hosts/tls_client/autotest_common_pb2_grpc.py
@@ -1,10 +1,10 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
import grpc
-
-import autotest_common_pb2 as autotest__common__pb2
-from dependencies.longrunning import operations_pb2 as dependencies_dot_longrunning_dot_operations__pb2
from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+import common
+from autotest_lib.server.hosts.tls_client import autotest_common_pb2 as autotest__common__pb2
+from autotest_lib.server.hosts.tls_client.dependencies.longrunning import operations_pb2 as dependencies_dot_longrunning_dot_operations__pb2
class CommonStub(object):
"""Common lab services implemented on top of the wiring APIs.
