Fix flaky test ResolverTest.BrokenEdns am: 22e7e69292 (39762cc7) · Commits · e / os / android_packages_modules_DnsResolver

resolver_test.cpp

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2182,7 +2182,6 @@ TEST_F(ResolverTest, BrokenEdns) {
	ASSERT_TRUE(dns.startServer());		ASSERT_TRUE(dns.startServer());

	test::DnsTlsFrontend tls(CLEARTEXT_ADDR, TLS_PORT, CLEARTEXT_ADDR, CLEARTEXT_PORT);		test::DnsTlsFrontend tls(CLEARTEXT_ADDR, TLS_PORT, CLEARTEXT_ADDR, CLEARTEXT_PORT);
	ASSERT_TRUE(tls.startServer());

	static const struct TestConfig {		static const struct TestConfig {
	std::string mode;		std::string mode;
	@@ -2249,16 +2248,28 @@ TEST_F(ResolverTest, BrokenEdns) {
	dns.setEdns(config.edns);		dns.setEdns(config.edns);

	if (config.mode == OFF) {		if (config.mode == OFF) {
			if (tls.running()) {
			ASSERT_TRUE(tls.stopServer());
			}
	ASSERT_TRUE(mDnsClient.SetResolversForNetwork(servers));		ASSERT_TRUE(mDnsClient.SetResolversForNetwork(servers));
	} else if (config.mode == OPPORTUNISTIC_UDP) {		} else if (config.mode == OPPORTUNISTIC_UDP) {
			if (tls.running()) {
			ASSERT_TRUE(tls.stopServer());
			}
	ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,		ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,
	kDefaultParams, "", {}));		kDefaultParams, "", {}));
	} else if (config.mode == OPPORTUNISTIC_TLS) {		} else if (config.mode == OPPORTUNISTIC_TLS) {
			if (!tls.running()) {
			ASSERT_TRUE(tls.startServer());
			}
	ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,		ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,
	kDefaultParams, "", {}));		kDefaultParams, "", {}));
	// Wait for validation to complete.		// Wait for validation to complete.
	EXPECT_TRUE(tls.waitForQueries(1, 5000));		EXPECT_TRUE(tls.waitForQueries(1, 5000));
	} else if (config.mode == STRICT) {		} else if (config.mode == STRICT) {
			if (!tls.running()) {
			ASSERT_TRUE(tls.startServer());
			}
	ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,		ASSERT_TRUE(mDnsClient.SetResolversWithTls(servers, kDefaultSearchDomains,
	kDefaultParams, "",		kDefaultParams, "",
	{base64Encode(tls.fingerprint())}));		{base64Encode(tls.fingerprint())}));