From 927d425ab0eea3079992122419413f102e9e1ca4 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 7 Jan 2018 20:33:38 -0800 Subject: [PATCH] tests/helpers: Increase timeout and deal with newlines TelnetControl can produce multiple newlines, make sure we filter through those. While testing with a Broadcom BCM5301x it was also found that a 10s timeout was too short, bump it up to 20s. --- dsatest/tests/helpers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dsatest/tests/helpers.py b/dsatest/tests/helpers.py index 3e66fb2..7756d66 100644 --- a/dsatest/tests/helpers.py +++ b/dsatest/tests/helpers.py @@ -38,13 +38,14 @@ def up_and_wait(up_interfaces, monitored=None, expand=True): if not monitored: monitored = interfaces - timeout = 10 + timeout = 20 while timeout: for interface in monitored: read_operstate_cmd = "cat /sys/class/net/{}/operstate".format(interface.name) ret, stdout, _ = interface.machine.execute(read_operstate_cmd) - if ret == 0 and stdout == "up": - monitored.remove(interface) + for line in stdout.splitlines(): + if ret == 0 and line == "up": + monitored.remove(interface) if not monitored: return