From 37629bacf5cff0bfde844e04e682a8a534b84f2c Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Wed, 7 Feb 2018 11:45:34 -0800 Subject: Regenerate projects --- test/cpp/naming/create_private_dns_zone.sh | 2 +- test/cpp/naming/private_dns_zone_init.sh | 2 +- test/cpp/naming/resolver_component_tests_runner.sh | 70 +++++++++++----------- .../resolver_gce_integration_tests_runner.sh | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) (limited to 'test/cpp/naming') diff --git a/test/cpp/naming/create_private_dns_zone.sh b/test/cpp/naming/create_private_dns_zone.sh index 55a4cfe36e..5c9364ca1a 100755 --- a/test/cpp/naming/create_private_dns_zone.sh +++ b/test/cpp/naming/create_private_dns_zone.sh @@ -17,7 +17,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." gcloud alpha dns managed-zones create \ resolver-tests-version-4-grpctestingexp-zone-id \ diff --git a/test/cpp/naming/private_dns_zone_init.sh b/test/cpp/naming/private_dns_zone_init.sh index 8fa5a8a475..fba8a005cc 100755 --- a/test/cpp/naming/private_dns_zone_init.sh +++ b/test/cpp/naming/private_dns_zone_init.sh @@ -17,7 +17,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." gcloud dns record-sets transaction start -z=resolver-tests-version-4-grpctestingexp-zone-id diff --git a/test/cpp/naming/resolver_component_tests_runner.sh b/test/cpp/naming/resolver_component_tests_runner.sh index 11a45d72ce..618a173dc0 100755 --- a/test/cpp/naming/resolver_component_tests_runner.sh +++ b/test/cpp/naming/resolver_component_tests_runner.sh @@ -18,10 +18,10 @@ set -ex # all command args required in this set order -FLAGS_test_bin_path=`echo "$1" | grep '\--test_bin_path=' | cut -d "=" -f 2` -FLAGS_dns_server_bin_path=`echo "$2" | grep '\--dns_server_bin_path=' | cut -d "=" -f 2` -FLAGS_records_config_path=`echo "$3" | grep '\--records_config_path=' | cut -d "=" -f 2` -FLAGS_test_dns_server_port=`echo "$4" | grep '\--test_dns_server_port=' | cut -d "=" -f 2` +FLAGS_test_bin_path=$(echo "$1" | grep '\--test_bin_path=' | cut -d "=" -f 2) +FLAGS_dns_server_bin_path=$(echo "$2" | grep '\--dns_server_bin_path=' | cut -d "=" -f 2) +FLAGS_records_config_path=$(echo "$3" | grep '\--records_config_path=' | cut -d "=" -f 2) +FLAGS_test_dns_server_port=$(echo "$4" | grep '\--test_dns_server_port=' | cut -d "=" -f 2) for cmd_arg in "$FLAGS_test_bin_path" "$FLAGS_dns_server_bin_path" "$FLAGS_records_config_path" "$FLAGS_test_dns_server_port"; do if [[ "$cmd_arg" == "" ]]; then @@ -34,7 +34,7 @@ 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_test_dns_server_port" 2>&1 > /dev/null & +"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_test_dns_server_port" > /dev/null 2>&1 & DNS_SERVER_PID=$! echo "Local DNS server started. PID: $DNS_SERVER_PID" @@ -53,15 +53,15 @@ done if [[ $RETRY == 1 ]]; then echo "FAILED TO START LOCAL DNS SERVER" - kill -SIGTERM $DNS_SERVER_PID + kill -SIGTERM "$DNS_SERVER_PID" wait exit 1 fi function terminate_all { echo "Received signal. Terminating $! and $DNS_SERVER_PID" - kill -SIGTERM $! || true - kill -SIGTERM $DNS_SERVER_PID || true + kill -SIGTERM "$!" || true + kill -SIGTERM "$DNS_SERVER_PID" || true wait exit 1 } @@ -77,105 +77,105 @@ $FLAGS_test_bin_path \ --expected_addrs='1.2.3.4:1234,True' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv4-multi-target.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.5:1234,True;1.2.3.6:1234,True;1.2.3.7:1234,True' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv6-single-target.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='[2607:f8b0:400a:801::1001]:1234,True' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv6-multi-target.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='[2607:f8b0:400a:801::1002]:1234,True;[2607:f8b0:400a:801::1003]:1234,True;[2607:f8b0:400a:801::1004]:1234,True' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv4-simple-service-config.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:1234,True' \ --expected_chosen_service_config='{"loadBalancingPolicy":"round_robin","methodConfig":[{"name":[{"method":"Foo","service":"SimpleService","waitForReady":true}]}]}' \ --expected_lb_policy='round_robin' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-no-srv-simple-service-config.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='{"loadBalancingPolicy":"round_robin","methodConfig":[{"name":[{"method":"Foo","service":"NoSrvSimpleService","waitForReady":true}]}]}' \ --expected_lb_policy='round_robin' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-no-config-for-cpp.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-cpp-config-has-zero-percentage.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-second-language-is-cpp.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='{"loadBalancingPolicy":"round_robin","methodConfig":[{"name":[{"method":"Foo","service":"CppService","waitForReady":true}]}]}' \ --expected_lb_policy='round_robin' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-config-with-percentages.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='{"loadBalancingPolicy":"round_robin","methodConfig":[{"name":[{"method":"Foo","service":"AlwaysPickedService","waitForReady":true}]}]}' \ --expected_lb_policy='round_robin' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv4-target-has-backend-and-balancer.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:1234,True;1.2.3.4:443,False' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='srv-ipv6-target-has-backend-and-balancer.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='[2607:f8b0:400a:801::1002]:1234,True;[2607:f8b0:400a:801::1002]:443,False' \ --expected_chosen_service_config='' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 $FLAGS_test_bin_path \ --target_name='ipv4-config-causing-fallback-to-tcp.resolver-tests-version-4.grpctestingexp.' \ --expected_addrs='1.2.3.4:443,False' \ --expected_chosen_service_config='{"loadBalancingPolicy":"round_robin","methodConfig":[{"name":[{"method":"Foo","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTwo","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooThree","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooFour","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooFive","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooSix","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooSeven","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooEight","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooNine","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTen","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooEleven","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTwelve","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTwelve","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTwelve","service":"SimpleService","waitForReady":true}]},{"name":[{"method":"FooTwelve","service":"SimpleService","waitForReady":true}]}]}' \ --expected_lb_policy='' \ - --local_dns_server_address=127.0.0.1:$FLAGS_test_dns_server_port & -wait $! || EXIT_CODE=1 + --local_dns_server_address="127.0.0.1:$FLAGS_test_dns_server_port" & +wait "$!" || EXIT_CODE=1 -kill -SIGTERM $DNS_SERVER_PID || true +kill -SIGTERM "$DNS_SERVER_PID" || true wait exit $EXIT_CODE diff --git a/test/cpp/naming/resolver_gce_integration_tests_runner.sh b/test/cpp/naming/resolver_gce_integration_tests_runner.sh index 091f9efbbd..2f673a59fd 100755 --- a/test/cpp/naming/resolver_gce_integration_tests_runner.sh +++ b/test/cpp/naming/resolver_gce_integration_tests_runner.sh @@ -24,7 +24,7 @@ elif [[ "$GRPC_DNS_RESOLVER" != ares ]]; then exit 1 fi -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." if [[ "$CONFIG" == "" ]]; then export CONFIG=opt -- cgit v1.2.3