From fd1a6604ab91cd05b4dcc5d886239c9e779482e1 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Fri, 25 May 2018 11:53:24 -0700 Subject: Remove a test --- .../cpp/naming/create_private_dns_zone.sh.template | 4 -- .../naming/create_private_dns_zone_defs.include | 32 ----------- .../cpp/naming/private_dns_zone_init.sh.template | 4 -- .../cpp/naming/private_dns_zone_init_defs.include | 40 -------------- .../resolver_gce_integration_tests_defs.include | 64 ---------------------- ...solver_gce_integration_tests_runner.sh.template | 4 -- 6 files changed, 148 deletions(-) delete mode 100644 templates/test/cpp/naming/create_private_dns_zone.sh.template delete mode 100644 templates/test/cpp/naming/create_private_dns_zone_defs.include delete mode 100644 templates/test/cpp/naming/private_dns_zone_init.sh.template delete mode 100644 templates/test/cpp/naming/private_dns_zone_init_defs.include delete mode 100644 templates/test/cpp/naming/resolver_gce_integration_tests_defs.include delete mode 100644 templates/test/cpp/naming/resolver_gce_integration_tests_runner.sh.template (limited to 'templates/test') diff --git a/templates/test/cpp/naming/create_private_dns_zone.sh.template b/templates/test/cpp/naming/create_private_dns_zone.sh.template deleted file mode 100644 index 14324b098c..0000000000 --- a/templates/test/cpp/naming/create_private_dns_zone.sh.template +++ /dev/null @@ -1,4 +0,0 @@ -%YAML 1.2 ---- | - <%namespace file="create_private_dns_zone_defs.include" import="*"/>\ - ${create_private_dns_zone(resolver_gce_integration_tests_zone_id, resolver_tests_common_zone_name)} diff --git a/templates/test/cpp/naming/create_private_dns_zone_defs.include b/templates/test/cpp/naming/create_private_dns_zone_defs.include deleted file mode 100644 index 76af9ab33d..0000000000 --- a/templates/test/cpp/naming/create_private_dns_zone_defs.include +++ /dev/null @@ -1,32 +0,0 @@ -<%def name="create_private_dns_zone(resolver_gce_integration_tests_zone_id, resolver_tests_common_zone_name)">#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file is auto-generated - -set -ex - -cd "$(dirname "$0")/../../.." - -gcloud alpha dns managed-zones create \\ - - ${resolver_gce_integration_tests_zone_id} \\ - - --dns-name=${resolver_tests_common_zone_name} \\ - - --description="GCE-DNS-private-zone-for-GRPC-testing" \\ - - --visibility=private \\ - - --networks=default diff --git a/templates/test/cpp/naming/private_dns_zone_init.sh.template b/templates/test/cpp/naming/private_dns_zone_init.sh.template deleted file mode 100644 index d5ffd04add..0000000000 --- a/templates/test/cpp/naming/private_dns_zone_init.sh.template +++ /dev/null @@ -1,4 +0,0 @@ -%YAML 1.2 ---- | - <%namespace file="private_dns_zone_init_defs.include" import="*"/>\ - ${private_dns_zone_init(all_integration_test_records, resolver_gce_integration_tests_zone_id, resolver_tests_common_zone_name)} diff --git a/templates/test/cpp/naming/private_dns_zone_init_defs.include b/templates/test/cpp/naming/private_dns_zone_init_defs.include deleted file mode 100644 index 1a6a590ac5..0000000000 --- a/templates/test/cpp/naming/private_dns_zone_init_defs.include +++ /dev/null @@ -1,40 +0,0 @@ -<%def name="private_dns_zone_init(records,resolver_gce_integration_tests_zone_id,resolver_tests_common_zone_name)">#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file is auto-generated - -set -ex - -cd "$(dirname "$0")/../../.." - -gcloud dns record-sets transaction start -z=${resolver_gce_integration_tests_zone_id} - -% for r in records: -gcloud dns record-sets transaction add \\ - - -z=${resolver_gce_integration_tests_zone_id} \\ - - --name=${r['name']}.${resolver_tests_common_zone_name} \\ - - --type=${r['type']} \\ - - --ttl=${r['ttl']} \\ - - ${r['data']} - -% endfor -gcloud dns record-sets transaction describe -z=${resolver_gce_integration_tests_zone_id} -gcloud dns record-sets transaction execute -z=${resolver_gce_integration_tests_zone_id} -gcloud dns record-sets list -z=${resolver_gce_integration_tests_zone_id} diff --git a/templates/test/cpp/naming/resolver_gce_integration_tests_defs.include b/templates/test/cpp/naming/resolver_gce_integration_tests_defs.include deleted file mode 100644 index 8a8377e38d..0000000000 --- a/templates/test/cpp/naming/resolver_gce_integration_tests_defs.include +++ /dev/null @@ -1,64 +0,0 @@ -<%def name="resolver_gce_integration_tests(tests, records, resolver_tests_common_zone_name)">#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file is auto-generated - -set -ex - -if [[ "$GRPC_DNS_RESOLVER" == "" ]]; then - export GRPC_DNS_RESOLVER=ares -elif [[ "$GRPC_DNS_RESOLVER" != ares ]]; then - echo "Unexpected: GRPC_DNS_RESOLVER=$GRPC_DNS_RESOLVER. This test only works with c-ares resolver" - exit 1 -fi - -cd "$(dirname "$0")/../../.." - -if [[ "$CONFIG" == "" ]]; then - export CONFIG=opt -fi -make resolver_component_test -echo "Sanity check DNS records are resolveable with dig:" -EXIT_CODE=0 - -% for r in records: -ONE_FAILED=0 -dig ${r['type']} ${r['name']}.${resolver_tests_common_zone_name} | grep 'ANSWER SECTION' || ONE_FAILED=1 -if [[ "$ONE_FAILED" != 0 ]]; then - echo "Sanity check: dig ${r['type']} ${r['name']}.${resolver_tests_common_zone_name} FAILED" - exit 1 -fi - -% endfor -echo "Sanity check PASSED. Run resolver tests:" - -% for test in tests: -ONE_FAILED=0 -bins/$CONFIG/resolver_component_test \\ - - % for arg_name_and_value in test['arg_names_and_values'][0:-1]: -\ - --${arg_name_and_value[0]}='${arg_name_and_value[1]}' \\ - -\ - % endfor - --${test['arg_names_and_values'][-1][0]}='${test['arg_names_and_values'][-1][1]}' || ONE_FAILED=1 -if [[ "$ONE_FAILED" != 0 ]]; then - echo "Test based on target record: ${test['test_title']} FAILED" - EXIT_CODE=1 -fi - -% endfor -exit $EXIT_CODE diff --git a/templates/test/cpp/naming/resolver_gce_integration_tests_runner.sh.template b/templates/test/cpp/naming/resolver_gce_integration_tests_runner.sh.template deleted file mode 100644 index c728784d29..0000000000 --- a/templates/test/cpp/naming/resolver_gce_integration_tests_runner.sh.template +++ /dev/null @@ -1,4 +0,0 @@ -%YAML 1.2 ---- | - <%namespace file="resolver_gce_integration_tests_defs.include" import="*"/>\ - ${resolver_gce_integration_tests(resolver_gce_integration_test_cases, all_integration_test_records, resolver_tests_common_zone_name)} -- cgit v1.2.3