From 550621c1b57c006fd18ddd0c9c3c589e8a2944ad Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Fri, 11 May 2018 14:20:11 -0700 Subject: Make local DNS server tests more generic --- test/cpp/naming/gen_build_yaml.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'test/cpp/naming/gen_build_yaml.py') diff --git a/test/cpp/naming/gen_build_yaml.py b/test/cpp/naming/gen_build_yaml.py index adebc62084..493713ff0e 100755 --- a/test/cpp/naming/gen_build_yaml.py +++ b/test/cpp/naming/gen_build_yaml.py @@ -119,12 +119,19 @@ def _resolver_test_cases(resolver_component_data, records_to_skip): for test_case in resolver_component_data['resolver_component_tests']: if test_case['record_to_resolve'] in records_to_skip: continue + target_name = _append_zone_name( + test_case['record_to_resolve'], + resolver_component_data['resolver_tests_common_zone_name']) out.append({ - 'target_name': _append_zone_name(test_case['record_to_resolve'], - resolver_component_data['resolver_tests_common_zone_name']), - 'expected_addrs': _build_expected_addrs_cmd_arg(test_case['expected_addrs']), - 'expected_chosen_service_config': (test_case['expected_chosen_service_config'] or ''), - 'expected_lb_policy': (test_case['expected_lb_policy'] or ''), + 'test_title': target_name, + 'arg_names_and_values': [ + ('target_name', target_name), + ('expected_addrs', + _build_expected_addrs_cmd_arg(test_case['expected_addrs'])), + ('expected_chosen_service_config', + (test_case['expected_chosen_service_config'] or '')), + ('expected_lb_policy', (test_case['expected_lb_policy'] or '')), + ], }) return out -- cgit v1.2.3