From 11a45a805755d0ba1cc914fda78432004d6e85a5 Mon Sep 17 00:00:00 2001
From: Alex Polcyn <apolcyn@google.com>
Date: Thu, 5 Apr 2018 01:58:54 +0000
Subject: [PATCH] Fix c-ares tests under gcc musl

---
 .../test/cpp/naming/resolver_component_tests_defs.include | 8 ++++++--
 .../dockerfile/test/cxx_alpine_x64/Dockerfile.template    | 1 +
 test/cpp/naming/resolver_component_tests_runner.sh        | 8 ++++++--
 tools/dockerfile/test/cxx_alpine_x64/Dockerfile           | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/templates/test/cpp/naming/resolver_component_tests_defs.include b/templates/test/cpp/naming/resolver_component_tests_defs.include
index 01e18605455..c29b4661259 100644
--- a/templates/test/cpp/naming/resolver_component_tests_defs.include
+++ b/templates/test/cpp/naming/resolver_component_tests_defs.include
@@ -36,7 +36,8 @@ if [[ "$GRPC_DNS_RESOLVER" != "" && "$GRPC_DNS_RESOLVER" != ares ]]; then
 fi
 export GRPC_DNS_RESOLVER=ares
 
-"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > /dev/null 2>&1 &
+DNS_SERVER_LOG="$(mktemp)"
+"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > "$DNS_SERVER_LOG" 2>&1 &
 DNS_SERVER_PID=$!
 echo "Local DNS server started. PID: $DNS_SERVER_PID"
 
@@ -55,8 +56,11 @@ done
 
 if [[ $RETRY == 1 ]]; then
   echo "FAILED TO START LOCAL DNS SERVER"
-  kill -SIGTERM "$DNS_SERVER_PID"
+  kill -SIGTERM "$DNS_SERVER_PID" || true
   wait
+  echo "========== DNS server log (merged stdout and stderr) ========="
+  cat "$DNS_SERVER_LOG"
+  echo "========== end DNS server log ================================"
   exit 1
 fi
 
diff --git a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template
index 1bbfdfdf25c..57d09862ed5 100644
--- a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template
@@ -34,6 +34,7 @@
     strace ${'\\'}
     python-dev ${'\\'}
     py-pip ${'\\'}
+    py-yaml ${'\\'}
     unzip ${'\\'}
     wget ${'\\'}
     zip
diff --git a/test/cpp/naming/resolver_component_tests_runner.sh b/test/cpp/naming/resolver_component_tests_runner.sh
index 18b56ab69ba..3f8765fa94b 100755
--- a/test/cpp/naming/resolver_component_tests_runner.sh
+++ b/test/cpp/naming/resolver_component_tests_runner.sh
@@ -36,7 +36,8 @@ if [[ "$GRPC_DNS_RESOLVER" != "" && "$GRPC_DNS_RESOLVER" != ares ]]; then
 fi
 export GRPC_DNS_RESOLVER=ares
 
-"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > /dev/null 2>&1 &
+DNS_SERVER_LOG="$(mktemp)"
+"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > "$DNS_SERVER_LOG" 2>&1 &
 DNS_SERVER_PID=$!
 echo "Local DNS server started. PID: $DNS_SERVER_PID"
 
@@ -55,8 +56,11 @@ done
 
 if [[ $RETRY == 1 ]]; then
   echo "FAILED TO START LOCAL DNS SERVER"
-  kill -SIGTERM "$DNS_SERVER_PID"
+  kill -SIGTERM "$DNS_SERVER_PID" || true
   wait
+  echo "========== DNS server log (merged stdout and stderr) ========="
+  cat "$DNS_SERVER_LOG"
+  echo "========== end DNS server log ================================"
   exit 1
 fi
 
diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
index c68a5ddbde5..72bd4b32d4f 100644
--- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
@@ -32,6 +32,7 @@ RUN apk update && apk add \
   strace \
   python-dev \
   py-pip \
+  py-yaml \
   unzip \
   wget \
   zip