matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #16523 from LabNConsulting/chopps/fix-mgmt-rpc-test

Browse source 
tests: wait for test client to connect before running test
This commit is contained in:
Donald Sharp 2024-08-07 13:27:39 -04:00 committed by GitHub
parent 0e1088c761 2ee9f4d11f
commit d36ff6df2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/topotests/mgmt_rpc/test_rpc.py
View file

@ -14,6 +14,7 @@ import os
import threading import threading
import pytest import pytest
from lib.common_config import retry
from lib.topogen import Topogen from lib.topogen import Topogen
from lib.topotest import json_cmp from lib.topotest import json_cmp
@ -40,12 +41,20 @@ def tgen(request):
tgen.stop_topology() tgen.stop_topology()
# Verify the backend test client has connected
@retry(retry_timeout=10)
def check_client_connect(r1):
out = r1.vtysh_cmd("show mgmt backend-adapter all")
assert "mgmtd-testc" in out
def test_backend_rpc(tgen): def test_backend_rpc(tgen):
if tgen.routers_have_failure(): if tgen.routers_have_failure():
pytest.skip(tgen.errors) pytest.skip(tgen.errors)
r1 = tgen.gears["r1"] r1 = tgen.gears["r1"]
# Run the backend test client which registers to handle the `clear ip rip` command.
be_client_path = "/usr/lib/frr/mgmtd_testc" be_client_path = "/usr/lib/frr/mgmtd_testc"
rc, _, _ = r1.net.cmd_status(be_client_path + " --help") rc, _, _ = r1.net.cmd_status(be_client_path + " --help")
@ -63,6 +72,10 @@ def test_backend_rpc(tgen):
t = threading.Thread(target=run_testc) t = threading.Thread(target=run_testc)
t.start() t.start()
# We need to wait for mgmtd_testc to connect before issuing the command.
res = check_client_connect(r1)
assert res is None
r1.vtysh_cmd("clear ip rip vrf testname") r1.vtysh_cmd("clear ip rip vrf testname")
t.join() t.join()