From: Paul Jakma <paul@quagga.net>
Date: Thu, 14 Jun 2012 09:42:39 +0000 (+0100)
Subject: tests: BGP unit tests to set BGP_OPT_NO_LISTEN so they can run
X-Git-Tag: frr-2.0-rc1~1801
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c9e4f8623642fc005c97830256000bef5680aa26;p=mirror%2Ffrr.git

tests: BGP unit tests to set BGP_OPT_NO_LISTEN so they can run

BGP tests had been broken by auto-creation of listen socket. This allows
them to run at least, though at least 1 test seems to have other breakage,
aspath_test.
---

diff --git a/tests/aspath_test.c b/tests/aspath_test.c
index 83eb9d808e..9170455fbd 100644
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -1259,6 +1259,7 @@ main (void)
   int i = 0;
   bgp_master_init ();
   master = bm->master;
+  bgp_option_set (BGP_OPT_NO_LISTEN);
   bgp_attr_init ();
   
   while (test_segments[i].name)
diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c
index 83da2e48fc..65c6a7002b 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgp_capability_test.c
@@ -618,6 +618,7 @@ main (void)
   
   master = thread_master_create ();
   bgp_master_init ();
+  bgp_option_set (BGP_OPT_NO_LISTEN);
   
   if (fileno (stdout) >= 0) 
     tty = isatty (fileno (stdout));
diff --git a/tests/bgp_mp_attr_test.c b/tests/bgp_mp_attr_test.c
index 1a48f4b74c..f086740fd3 100644
--- a/tests/bgp_mp_attr_test.c
+++ b/tests/bgp_mp_attr_test.c
@@ -515,6 +515,7 @@ main (void)
   
   master = thread_master_create ();
   bgp_master_init ();
+  bgp_option_set (BGP_OPT_NO_LISTEN);
   
   if (fileno (stdout) >= 0) 
     tty = isatty (fileno (stdout));
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index 15e450a20b..3d0ecb78bf 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -378,7 +378,8 @@ global_test_init (void)
   master = thread_master_create ();
   zclient = zclient_new ();
   bgp_master_init ();
-
+  bgp_option_set (BGP_OPT_NO_LISTEN);
+  
   if (fileno (stdout) >= 0)
     tty = isatty (fileno (stdout));
   return 0;