Merge "Make bgp_show_neighbor_test more robust" into R2.20

Juniper · Aug 17, 2015 · 91045f2 · 91045f2
2 parents 35d130c + 1b79ac2
commit 91045f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/bgp/bgp_xmpp_channel.cc b/src/bgp/bgp_xmpp_channel.cc
@@ -2253,6 +2253,10 @@ void BgpXmppChannelManager::SetQueueDisable(bool disabled) {
     queue_.set_disable(disabled);
 }
 
+size_t BgpXmppChannelManager::GetQueueSize() const {
+    return queue_.Length();
+}
+
 void BgpXmppChannelManager::ASNUpdateCallback(as_t old_asn,
     as_t old_local_asn) {
     BOOST_FOREACH(XmppChannelMap::value_type &i, channel_map_) {

diff --git a/src/bgp/bgp_xmpp_channel.h b/src/bgp/bgp_xmpp_channel.h
@@ -272,6 +272,7 @@ class BgpXmppChannelManager {
     }
     bool IsReadyForDeletion();
     void SetQueueDisable(bool disabled);
+    size_t GetQueueSize() const;
     void RoutingInstanceCallback(std::string vrf_name, int op);
     void ASNUpdateCallback(as_t old_asn, as_t old_local_asn);
     void IdentifierUpdateCallback(Ip4Address old_identifier);

diff --git a/src/bgp/test/bgp_show_neighbor_test.cc b/src/bgp/test/bgp_show_neighbor_test.cc
@@ -300,6 +300,15 @@ class BgpShowNeighborTest : public ::testing::Test {
         peer_y2->deleter()->ResumeDelete();
     }
 
+    void VerifyBgpPeerDelete() {
+        BgpPeer *peer_y1 = bgp_server_x_->FindMatchingPeer(
+            BgpConfigManager::kMasterInstance, "Y1");
+        TASK_UTIL_EXPECT_TRUE(peer_y1->IsDeleted());
+        BgpPeer *peer_y2 = bgp_server_x_->FindMatchingPeer(
+            BgpConfigManager::kMasterInstance, "Y2");
+        TASK_UTIL_EXPECT_TRUE(peer_y2->IsDeleted());
+    }
+
     void AddBgpPeerNames(vector<string> *neighbor_names,
         const string &name = string()) {
         if (name.empty() || name == "Y1") {
@@ -671,7 +680,9 @@ TYPED_TEST(BgpShowNeighborTest, RequestWithSearch8) {
     this->PauseBgpPeerDelete();
     this->bcm_x_->SetQueueDisable(true);
     this->ShutdownAgents();
+    TASK_UTIL_EXPECT_EQ(12, this->bcm_x_->GetQueueSize());
     this->bgp_server_x_->Shutdown(false);
+    this->VerifyBgpPeerDelete();
     this->sandesh_context_.set_page_limit(0);
     this->sandesh_context_.set_iter_limit(0);
     vector<string> neighbor_names;