aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-20 20:19:16 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-20 20:19:16 +0000
commitb8c96cbf21f203e87181e243516de53130165ca5 (patch)
treeccd1be84b27bdf09f10979a621506a444f92f175
parent9b58d1a3daa400ce4b0003e812449695acd8c56f (diff)
Merged revisions 328992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/2.0 ................ r328992 | twilson | 2011-07-20 15:18:25 -0500 (Wed, 20 Jul 2011) | 12 lines Merged revisions 328987 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r328987 | twilson | 2011-07-20 15:16:58 -0500 (Wed, 20 Jul 2011) | 5 lines We can't guarantee an eth0 is present FreeBSD test fails on this case presumably because there is no eth0 on the test machine. Better to just remove this test for now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328996 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--tests/test_netsock2.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c
index f759ed2ce..8d7e1ebd8 100644
--- a/tests/test_netsock2.c
+++ b/tests/test_netsock2.c
@@ -69,7 +69,6 @@ AST_TEST_DEFINE(parsing)
{ "[2001::1]", 1 },
{ "[2001:0000:4136:e378:8000:63bf:3fff:fdd2]:5060", 1 },
{ "2001:0000:4136:e378:8000:63bf:3fff:fdd2:5060", 0 }, /* port, but no brackets */
- { "[fe80::200:5aee:feaa:20a2%eth0]", 1 }, /* link-local with scope id */
{ "[fe80::200::abcd", 0 }, /* multiple zero expansions */
};