Skip to content

Commit

Permalink
Merge pull request #17328 from opensourcerouting/fix/allow_setting_ne…
Browse files Browse the repository at this point in the history
…tlink_buffer_size_for_zebra

tests: Do not set by default netlink receive buffer size for Zebra
  • Loading branch information
donaldsharp authored Nov 1, 2024
2 parents 23c92ed + 6dc03df commit eded1e9
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions tests/topotests/lib/topotest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1903,7 +1903,7 @@ def startRouterDaemons(self, daemons=None, tgen=None):
tail_log_files = []
check_daemon_files = []

def start_daemon(daemon, extra_opts=None):
def start_daemon(daemon):
daemon_opts = self.daemons_options.get(daemon, "")

# get pid and vty filenames and remove the files
Expand Down Expand Up @@ -1998,9 +1998,6 @@ def do_gdb_or_rr(gdb):
"{}/{}/{}.log".format(self.logdir, self.name, daemon)
)

if extra_opts:
cmdopt += " " + extra_opts

if do_gdb_or_rr(True) and do_gdb_or_rr(False):
logger.warning("cant' use gdb and rr at same time")

Expand Down Expand Up @@ -2237,7 +2234,7 @@ def emacs_gdb_ready():

# Start Zebra after mgmtd
if "zebra" in daemons_list:
start_daemon("zebra", "-s 90000000")
start_daemon("zebra")
while "zebra" in daemons_list:
daemons_list.remove("zebra")

Expand Down

0 comments on commit eded1e9

Please sign in to comment.