diff --git a/templates/test/cpp/naming/resolver_component_tests_defs.include b/templates/test/cpp/naming/resolver_component_tests_defs.include index 7251f4f392e..91094228343 100644 --- a/templates/test/cpp/naming/resolver_component_tests_defs.include +++ b/templates/test/cpp/naming/resolver_component_tests_defs.include @@ -79,7 +79,7 @@ def wait_until_dns_server_is_up(args, stdout=subprocess.PIPE) dns_resolver_stdout, _ = dns_resolver_subprocess.communicate(str.encode('ascii')) if dns_resolver_subprocess.returncode == 0: - if bytes('123.123.123.123'.encode('ascii')) in dns_resolver_stdout: + if '123.123.123.123'.encode('ascii') in dns_resolver_stdout: test_runner_log(('DNS server is up! ' 'Successfully reached it over UDP and TCP.')) return diff --git a/test/cpp/naming/resolver_component_tests_runner.py b/test/cpp/naming/resolver_component_tests_runner.py index db39615fddd..058968e6b93 100755 --- a/test/cpp/naming/resolver_component_tests_runner.py +++ b/test/cpp/naming/resolver_component_tests_runner.py @@ -79,7 +79,7 @@ def wait_until_dns_server_is_up(args, stdout=subprocess.PIPE) dns_resolver_stdout, _ = dns_resolver_subprocess.communicate(str.encode('ascii')) if dns_resolver_subprocess.returncode == 0: - if bytes('123.123.123.123'.encode('ascii')) in dns_resolver_stdout: + if '123.123.123.123'.encode('ascii') in dns_resolver_stdout: test_runner_log(('DNS server is up! ' 'Successfully reached it over UDP and TCP.')) return diff --git a/test/cpp/naming/utils/dns_server.py b/test/cpp/naming/utils/dns_server.py index 1685079ef93..77f76983d2a 100755 --- a/test/cpp/naming/utils/dns_server.py +++ b/test/cpp/naming/utils/dns_server.py @@ -53,7 +53,7 @@ def start_local_dns_server(args): all_records = {} def _push_record(name, r): - name = bytes(name.encode('ascii')) + name = name.encode('ascii') print('pushing record: |%s|' % name) if all_records.get(name) is not None: all_records[name].append(r) @@ -61,7 +61,7 @@ def start_local_dns_server(args): all_records[name] = [r] def _maybe_split_up_txt_data(name, txt_data, r_ttl): - txt_data = bytes(txt_data.encode('ascii')) + txt_data = txt_data.encode('ascii') start = 0 txt_data_list = [] while len(txt_data[start:]) > 0: @@ -95,8 +95,7 @@ def start_local_dns_server(args): p = int(p) w = int(w) port = int(port) - target_full_name = bytes( - ('%s.%s' % (target, common_zone_name)).encode('ascii')) + target_full_name = ('%s.%s' % (target, common_zone_name)).encode('ascii') _push_record( record_full_name, dns.Record_SRV(p, w, port, target_full_name, ttl=r_ttl)) @@ -109,9 +108,9 @@ def start_local_dns_server(args): # Server health check record _push_record(_SERVER_HEALTH_CHECK_RECORD_NAME, dns.Record_A(_SERVER_HEALTH_CHECK_RECORD_DATA, ttl=0)) - soa_record = dns.Record_SOA(mname=bytes(common_zone_name.encode('ascii'))) + soa_record = dns.Record_SOA(mname=common_zone_name.encode('ascii')) test_domain_com = NoFileAuthority( - soa=(bytes(common_zone_name.encode('ascii')), soa_record), + soa=(common_zone_name.encode('ascii'), soa_record), records=all_records, ) server = twisted.names.server.DNSServerFactory(