From ebdeb54b1d1b59409444b13e8194e64df130c66a Mon Sep 17 00:00:00 2001
From: Tiago Quelhas <tjgq@google.com>
Date: Mon, 29 Aug 2022 16:01:43 +0200
Subject: [PATCH] Reenable the UDS proxy tests.

---
 .../shell/bazel/remote/remote_execution_test.sh    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh
index d9c09f9da6e65c..a7f2a30abd3a28 100755
--- a/src/test/shell/bazel/remote/remote_execution_test.sh
+++ b/src/test/shell/bazel/remote/remote_execution_test.sh
@@ -157,8 +157,7 @@ EOF
       || fail "Failed to build //a:foo with remote cache"
 }
 
-# TODO(b/211478955): Deflake and re-enable.
-function DISABLED_test_remote_grpc_via_unix_socket_proxy() {
+function test_remote_grpc_via_unix_socket_proxy() {
   case "$PLATFORM" in
   darwin|freebsd|linux|openbsd)
     ;;
@@ -182,12 +181,12 @@ EOF
   # small maximum length limits for UNIX domain sockets.
   socket_dir=$(mktemp -d -t "remote_executor.XXXXXXXX")
   PROXY="$(rlocation io_bazel/src/test/shell/bazel/remote/uds_proxy.py)"
-  python "${PROXY}" "${socket_dir}/executor-socket" "localhost:${worker_port}" &
+  python3 "${PROXY}" "${socket_dir}/executor-socket" "localhost:${worker_port}" &
   proxy_pid=$!
 
   bazel build \
       --remote_executor=grpc://noexist.invalid \
-      --remote_proxy="unix:${socket_dir}/executor-socket" \
+      --remote_proxy="unix://${socket_dir}/executor-socket" \
       //a:foo \
       || fail "Failed to build //a:foo with remote cache"
 
@@ -196,8 +195,7 @@ EOF
   rmdir "${socket_dir}"
 }
 
-# TODO(b/211478955): Deflake and re-enable.
-function DISABLED_test_remote_grpc_via_unix_socket_direct() {
+function test_remote_grpc_via_unix_socket_direct() {
   case "$PLATFORM" in
   darwin|freebsd|linux|openbsd)
     ;;
@@ -221,11 +219,11 @@ EOF
   # small maximum length limits for UNIX domain sockets.
   socket_dir=$(mktemp -d -t "remote_executor.XXXXXXXX")
   PROXY="$(rlocation io_bazel/src/test/shell/bazel/remote/uds_proxy.py)"
-  python "${PROXY}" "${socket_dir}/executor-socket" "localhost:${worker_port}" &
+  python3 "${PROXY}" "${socket_dir}/executor-socket" "localhost:${worker_port}" &
   proxy_pid=$!
 
   bazel build \
-      --remote_executor="unix:${socket_dir}/executor-socket" \
+      --remote_executor="unix://${socket_dir}/executor-socket" \
       //a:foo \
       || fail "Failed to build //a:foo with remote cache"