2020-02-04 12:49:24 +01:00
|
|
|
Index: c-ares-1.15.0-20200117/test/Makefile.inc
|
2019-02-13 17:25:34 +01:00
|
|
|
===================================================================
|
2020-02-04 12:49:24 +01:00
|
|
|
--- c-ares-1.15.0-20200117.orig/test/Makefile.inc
|
|
|
|
+++ c-ares-1.15.0-20200117/test/Makefile.inc
|
|
|
|
@@ -13,7 +13,6 @@ TESTSOURCES = ares-test-main.cc \
|
2019-02-13 17:25:34 +01:00
|
|
|
ares-test-parse-srv.cc \
|
|
|
|
ares-test-parse-txt.cc \
|
|
|
|
ares-test-misc.cc \
|
|
|
|
- ares-test-live.cc \
|
|
|
|
ares-test-mock.cc \
|
2019-11-08 15:58:09 +01:00
|
|
|
ares-test-mock-ai.cc \
|
2019-02-13 17:25:34 +01:00
|
|
|
ares-test-internal.cc \
|
2020-02-04 12:49:24 +01:00
|
|
|
Index: c-ares-1.15.0-20200117/test/ares-test-misc.cc
|
2019-02-13 17:25:34 +01:00
|
|
|
===================================================================
|
2020-02-04 12:49:24 +01:00
|
|
|
--- c-ares-1.15.0-20200117.orig/test/ares-test-misc.cc
|
|
|
|
+++ c-ares-1.15.0-20200117/test/ares-test-misc.cc
|
2019-02-13 17:25:34 +01:00
|
|
|
@@ -47,10 +47,12 @@ TEST_F(DefaultChannelTest, SetServers) {
|
|
|
|
EXPECT_EQ(expected, GetNameServers(channel_));
|
|
|
|
|
|
|
|
// Change not allowed while request is pending
|
|
|
|
+ /*
|
|
|
|
HostResult result;
|
|
|
|
ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result);
|
|
|
|
EXPECT_EQ(ARES_ENOTIMP, ares_set_servers(channel_, &server1));
|
|
|
|
ares_cancel(channel_);
|
|
|
|
+ */
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(DefaultChannelTest, SetServersPorts) {
|
|
|
|
@@ -77,10 +79,12 @@ TEST_F(DefaultChannelTest, SetServersPor
|
|
|
|
EXPECT_EQ(expected, GetNameServers(channel_));
|
|
|
|
|
|
|
|
// Change not allowed while request is pending
|
|
|
|
+ /*
|
|
|
|
HostResult result;
|
|
|
|
ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result);
|
|
|
|
EXPECT_EQ(ARES_ENOTIMP, ares_set_servers_ports(channel_, &server1));
|
|
|
|
ares_cancel(channel_);
|
|
|
|
+ */
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(DefaultChannelTest, SetServersCSV) {
|
|
|
|
@@ -109,11 +113,13 @@ TEST_F(DefaultChannelTest, SetServersCSV
|
|
|
|
EXPECT_EQ(expected2, GetNameServers(channel_));
|
|
|
|
|
|
|
|
// Change not allowed while request is pending
|
|
|
|
+ /*
|
|
|
|
HostResult result;
|
|
|
|
ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result);
|
|
|
|
EXPECT_EQ(ARES_ENOTIMP, ares_set_servers_csv(channel_, "1.2.3.4,2.3.4.5"));
|
|
|
|
EXPECT_EQ(ARES_ENOTIMP, ares_set_servers_ports_csv(channel_, "1.2.3.4:56,2.3.4.5:67"));
|
|
|
|
ares_cancel(channel_);
|
|
|
|
+ */
|
|
|
|
|
|
|
|
// Should survive duplication
|
|
|
|
ares_channel channel2;
|