[Windows] Fix thrift proxy tests

test/extensions/filters/network/thrift_proxy/BUILD

@@ -333,7 +333,6 @@ envoy_extension_cc_test(
         "//test/extensions/filters/network/thrift_proxy/driver:generate_fixture",
     ],
     extension_name = "envoy.filters.network.thrift_proxy",
-    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         ":utility_lib",
@@ -350,7 +349,6 @@ envoy_extension_cc_test(
         "//test/extensions/filters/network/thrift_proxy/driver:generate_fixture",
     ],
     extension_name = "envoy.filters.network.thrift_proxy",
-    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         ":utility_lib",

test/extensions/filters/network/thrift_proxy/driver/client.py

@@ -14,6 +14,8 @@
 from fbthrift import THeaderTransport
 from twitter.common.rpc.finagle.protocol import TFinagleProtocol
 
+sys.stdin.reconfigure(encoding='utf-8')
+sys.stdout.reconfigure(encoding='utf-8')
 
 class TRecordingTransport(TTransport.TTransportBase):
 

test/extensions/filters/network/thrift_proxy/driver/generate_fixture.sh

@@ -7,20 +7,11 @@
 set -e
 
 function usage() {
-    echo "Usage: $0 <mode> <transport> <protocol> -s [multiplex-service] -H [headers] method [param...]"
+    echo "Usage: $0 <mode> <transport> <protocol> -s [multiplex-service] -H [headers] -T [TempPath] method [param...]"
     echo "where mode is success, exception, or idl-exception"
     exit 1
 }
 
-FIXTURE_DIR="${TEST_TMPDIR}"
-mkdir -p "${FIXTURE_DIR}"
-
-DRIVER_DIR="${TEST_SRCDIR}/envoy/test/extensions/filters/network/thrift_proxy/driver"
-
-if [[ -z "${TEST_UDSDIR}" ]]; then
-    TEST_UDSDIR=$(mktemp -d /tmp/envoy_test_thrift.XXXXXX)
-fi
-
 MODE="$1"
 TRANSPORT="$2"
 PROTOCOL="$3"
@@ -35,15 +26,18 @@ fi
 
 MULTIPLEX=
 HEADERS=
-while getopts ":s:H:" opt; do
+TEST_TMPDIR=
+while getopts ":s:H:T:" opt; do
     case ${opt} in
         s)
             MULTIPLEX=$OPTARG
             ;;
         H)
             HEADERS=$OPTARG
             ;;
-
+        T)
+            TEST_TMPDIR=$OPTARG
+            ;;
         \?)
             echo "Invalid Option: -$OPTARG" >&2
             exit 1
@@ -62,11 +56,24 @@ if [[ "${METHOD}" == "" ]]; then
 fi
 shift
 
-SOCKET="${TEST_UDSDIR}/fixture.sock"
-rm -f "${SOCKET}"
+FIXTURE_DIR="${TEST_TMPDIR}"
+mkdir -p "${FIXTURE_DIR}"
+
+DRIVER_DIR="${TEST_SRCDIR}/envoy/test/extensions/filters/network/thrift_proxy/driver"
+
+
+while
+  port=$(shuf -n 1 -i 49152-65535)
+  netstat -atn | grep -q "$port" >> /dev/null
+do
+  continue
+done
+
+
+SOCKET="127.0.0.1:${port}"
+echo "Using address ${SOCKET}"
 
 SERVICE_FLAGS=("--addr" "${SOCKET}"
-               "--unix"
                "--response" "${MODE}"
                "--transport" "${TRANSPORT}"
                "--protocol" "${PROTOCOL}")
@@ -83,26 +90,20 @@ else
 fi
 
 # start server
-"${DRIVER_DIR}/server" "${SERVICE_FLAGS[@]}" &
+"${DRIVER_DIR}/server.py" "${SERVICE_FLAGS[@]}" &
 SERVER_PID="$!"
 
 trap 'kill ${SERVER_PID}' EXIT;
 
-while [[ ! -a "${SOCKET}" ]]; do
-    sleep 0.1
-
-    if ! kill -0 "${SERVER_PID}"; then
-        echo "server failed to start"
-        exit 1
-    fi
-done
 
 if [[ -n "$HEADERS" ]]; then
     SERVICE_FLAGS+=("--headers")
     SERVICE_FLAGS+=("$HEADERS")
 fi
 
-"${DRIVER_DIR}/client" "${SERVICE_FLAGS[@]}" \
+echo  "${METHOD}" "$@"
+
+"${DRIVER_DIR}/client.py" "${SERVICE_FLAGS[@]}" \
                        --request "${REQUEST_FILE}" \
                        --response "${RESPONSE_FILE}" \
                        "${METHOD}" "$@"

test/extensions/filters/network/thrift_proxy/driver/server.py

@@ -15,6 +15,8 @@
 from fbthrift import THeaderTransport
 from finagle import TFinagleServerProcessor, TFinagleServerProtocol
 
+sys.stdin.reconfigure(encoding='utf-8')
+sys.stdout.reconfigure(encoding='utf-8')
 
 class SuccessHandler:
 

test/extensions/filters/network/thrift_proxy/integration.cc

@@ -80,6 +80,10 @@ void BaseThriftIntegrationTest::preparePayloads(const PayloadOptions& options,
     args.push_back(absl::StrJoin(headers, ","));
   }
 
+  auto temp_path = TestEnvironment::temporaryDirectory();
+  args.push_back("-T");
+  args.push_back(temp_path);
+
   args.push_back(options.method_name_);
   std::copy(options.method_args_.begin(), options.method_args_.end(), std::back_inserter(args));
 

test/extensions/filters/network/thrift_proxy/integration_test.cc

@@ -398,6 +398,9 @@ INSTANTIATE_TEST_SUITE_P(FramedTwitter, ThriftTwitterConnManagerIntegrationTest,
                                  Values(false, true)),
                          paramToString);
 
+// This test relies on an old apache thrift python package
+// that is only available in python2. Disabling the test on Windows.
+#ifndef WIN32
 // Because of the protocol upgrade requests and the difficulty of separating them, we test this
 // protocol independently.
 TEST_P(ThriftTwitterConnManagerIntegrationTest, Success) {
@@ -458,6 +461,7 @@ TEST_P(ThriftTwitterConnManagerIntegrationTest, Success) {
   counter = test_server_->counter("thrift.thrift_stats.response_success");
   EXPECT_EQ(2U, counter->value());
 }
+#endif
 
 } // namespace ThriftProxy
 } // namespace NetworkFilters