smoketest: bgp: T4163: add explicit timeout when starting BMP

(cherry picked from commit 259a3d637081fad9f86a8edb39814d8f0fbf7b95)

1 files changed, 7 insertions, 2 deletions

diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 8102a3153..4697d4970 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+
 from subprocess import run
+from time import sleep
 
 from base_vyostest_shim import VyOSUnitTestSHIM
 
@@ -1160,13 +1162,12 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         mirror_buffer = '32000000'
         bmp_path = base_path + ['bmp']
         target_path = bmp_path + ['target', target_name]
-        bgpd_bmp_pid = process_named_running('bgpd', 'bmp')
         command = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'restart', 'bgp']
 
         self.cli_set(bmp_path)
         # by default the 'bmp' module not loaded for the bgpd
         # expect Error
-        if not bgpd_bmp_pid:
+        if not process_named_running('bgpd', 'bmp'):
             with self.assertRaises(ConfigSessionError):
                 self.cli_commit()
 
@@ -1174,8 +1175,12 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.cli_delete(bmp_path)
         self.cli_set(['system', 'frr', 'bmp'])
         self.cli_commit()
+
         # restart bgpd to apply "-M bmp" and update PID
         run(command, input='Y', text=True)
+        # let the bgpd process recover
+        sleep(10)
+        # update daemon PID - this was a planned daemon restart
         self.daemon_pid = process_named_running(PROCESS_NAME)
 
         # set bmp config but not set address