Merge pull request #136 from jbemmel/modify-buffer-cleanout

Revert cleaning of buffer for other platforms than SR OS

Author: hellt

common/vrnetlab.py

@@ -636,7 +636,7 @@ def restart(self):
         self.stop()
         self.start()
 
-    def wait_write(self, cmd, wait="__defaultpattern__", con=None):
+    def wait_write(self, cmd, wait="__defaultpattern__", con=None, clean_buffer=False):
         """Wait for something on the serial port and then send command
 
         Defaults to using self.tn as connection but this can be overridden
@@ -659,7 +659,7 @@ def wait_write(self, cmd, wait="__defaultpattern__", con=None):
             res = con.read_until(wait.encode())
 
             cleaned_buf = (
-                con.read_very_eager()
+                (con.read_very_eager()) if clean_buffer else None
             )  # Clear any remaining characters in buffer
 
             self.logger.trace(f"read from {con_name}: '{res.decode()}'")

sros/docker/launch.py

@@ -631,9 +631,13 @@ def __init__(self, username, password, ram, conn_mode, cpu=2, num=0):
         self.cpu = cpu
         self.qemu_args.extend(["-cpu", "host", "-smp", f"{cpu}"])
 
-        # override default wait patter with hash followed by the space
+        # override default wait pattern with hash followed by the space
         self.wait_pattern = "# "
 
+    # override wait_write clean_buffer parameter default
+    def wait_write(self, cmd, wait="__defaultpattern__", con=None, clean_buffer=True):
+        super().wait_write( cmd, wait, con, clean_buffer)
+
     def bootstrap_spin(self):
         """This function should be called periodically to do work."""