forked from pool/c-ares
42b6c9750c
Previous set of patches broke NodeJS 12.x unit tests. With the complete upstream snapshot, the tests pass as the regressions are fixed. - Update to upstream snapshot 20191108 * getaddrinfo - avoid infinite loop in case of NXDOMAIN * ares_getenv - return NULL in all cases * implement ares_getaddrinfo - onion-crash.patch: removed, upstreamed. - removed upstream patches that are part of the snapshot: 0001-Add-initial-implementation-for-ares_getaddrinfo-112.patch 0002-Remaining-queries-counter-fix-additional-unit-tests-.patch 0003-Bugfix-for-ares_getaddrinfo-and-additional-unit-test.patch 0004-Add-ares__sortaddrinfo-to-support-getaddrinfo-sorted.patch 0005-getaddrinfo-avoid-infinite-loop-in-case-of-NXDOMAIN-.patch 0006-getaddrinfo-callback-must-be-called-on-bad-domain-24.patch 0007-getaddrinfo-enhancements-257.patch 0008-Add-missing-limits.h-include-from-ares_getaddrinfo.c.patch 0009-Increase-portability-of-ares-test-mock-ai.cc-235.patch 0010-Disable-failing-test.patch - disable-live-tests.patch - updated OBS-URL: https://build.opensuse.org/request/show/746633 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/c-ares?expand=0&rev=11
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
Index: c-ares-1.15.0-20191108/test/Makefile.inc
|
|
===================================================================
|
|
--- c-ares-1.15.0-20191108.orig/test/Makefile.inc
|
|
+++ c-ares-1.15.0-20191108/test/Makefile.inc
|
|
@@ -13,8 +13,6 @@ TESTSOURCES = ares-test-main.cc \
|
|
ares-test-parse-srv.cc \
|
|
ares-test-parse-txt.cc \
|
|
ares-test-misc.cc \
|
|
- ares-test-live.cc \
|
|
- ares-test-live-ai.cc \
|
|
ares-test-mock.cc \
|
|
ares-test-mock-ai.cc \
|
|
ares-test-internal.cc \
|
|
Index: c-ares-1.15.0-20191108/test/ares-test-misc.cc
|
|
===================================================================
|
|
--- c-ares-1.15.0-20191108.orig/test/ares-test-misc.cc
|
|
+++ c-ares-1.15.0-20191108/test/ares-test-misc.cc
|
|
@@ -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;
|