From 19afb923ce31fa51291d12b79d8b63cfce09ab14 Mon Sep 17 00:00:00 2001 From: Miroslav Miklus Date: Mon, 10 Oct 2016 08:49:59 +0200 Subject: Ipv6 TEST fixes - Increase interactive terminal timeout - ip6 heapsize - performance lib fix Change-Id: Iac6beb041200c4b0c5cf29dceb5113df64c6c9b0 Signed-off-by: Miroslav Miklus --- resources/libraries/python/VppConfigGenerator.py | 2 +- resources/libraries/python/ssh.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index ad3f23483e..d4ef04e65c 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -63,7 +63,7 @@ dpdk {{ ip6 {{ hash-buckets 2000000 - heap-size 500m + heap-size 1G }} """ diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index 8acb54b382..4b3838bbb7 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -195,7 +195,7 @@ class SSH(object): command = 'sudo -S {c} <<< "{i}"'.format(c=cmd, i=cmd_input) return self.exec_command(command, timeout) - def interactive_terminal_open(self, time_out=10): + def interactive_terminal_open(self, time_out=30): """Open interactive terminal on a new channel on the connected Node. :param time_out: Timeout in seconds. @@ -228,8 +228,7 @@ class SSH(object): raise Exception('Socket timeout: {0}'.format(buf)) return chan - def interactive_terminal_exec_command(self, chan, cmd, prompt, - time_out=30): + def interactive_terminal_exec_command(self, chan, cmd, prompt): """Execute command on interactive terminal. interactive_terminal_open() method has to be called first! @@ -238,7 +237,6 @@ class SSH(object): :param cmd: Command to be executed. :param prompt: Command prompt, sequence of characters used to indicate readiness to accept commands. - :param time_out: Timeout in seconds. :return: Command output. .. warning:: Interruptingcow is used here, and it uses -- cgit 1.2.3-korg