Merge "Partial-Bug: 1464016 During TearDown(), Delete BGP peers and t…

…hen shutdown the server"
Juniper · Jul 29, 2015 · 1ecb0c2 · 1ecb0c2
2 parents 46f94f5 + 32328f2
commit 1ecb0c2
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/bgp/test/bgp_stress_test.cc b/src/bgp/test/bgp_stress_test.cc
@@ -577,14 +577,7 @@ void BgpStressTest::TearDown() {
     TcpServerManager::DeleteServer(xmpp_server_test_);
     xmpp_server_test_ = NULL;
 
-    BOOST_FOREACH(BgpServerTest *peer_server, peer_servers_) {
-        if (peer_server) {
-            peer_server->Shutdown();
-            WaitForIdle();
-            delete peer_server;
-        }
-    }
-    WaitForIdle();
+    DeleteBgpPeers(n_peers_);
     server_->Shutdown();
     WaitForIdle();
     Cleanup();