summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-07-20 20:19:16 +0000
committerTerry Wilson <twilson@digium.com>2011-07-20 20:19:16 +0000
commitaada2733d6008775e922f8284bb9409ce75eb767 (patch)
treeccd1be84b27bdf09f10979a621506a444f92f175
parent9c232a54703b9f819c2da5576163a85d18874471 (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: https://origsvn.digium.com/svn/asterisk/trunk@328996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-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 */
};