From 413f4a5b2123c1625d615315db293a080078482b Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 28 Nov 2018 11:36:05 +0100 Subject: API: Use string type instead of u8. The new string type is modelled after string in proto3. It is always variable length. Change-Id: I64884067e28a80072c8dac31b7c7c82d6e306051 Signed-off-by: Ole Troan Signed-off-by: Michal Cmarada Signed-off-by: Ole Troan --- test/framework.py | 2 +- test/vpp_papi_provider.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/framework.py b/test/framework.py index 242a0798212..f82f0750387 100644 --- a/test/framework.py +++ b/test/framework.py @@ -918,7 +918,7 @@ class VppTestCase(unittest.TestCase): def assert_packet_counter_equal(self, counter, expected_value): counters = self.vapi.cli("sh errors").split('\n') counter_value = -1 - for i in range(1, len(counters) - 1): + for i in range(1, len(counters)): results = counters[i].split() if results[1] == counter: counter_value = int(results[0]) diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 320ea12c6dc..4812cb6ef70 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -210,10 +210,10 @@ class VppPapiProvider(object): """ self.hook.before_cli(cli) cli += '\n' - r = self.papi.cli_inband(length=len(cli), cmd=str(cli).encode('utf8')) + r = self.papi.cli_inband(cmd=cli) self.hook.after_cli(cli) if hasattr(r, 'reply'): - return r.reply.decode().rstrip('\x00') + return r.reply def ppcli(self, cli): """ Helper method to print CLI command in case of info logging level. -- cgit 1.2.3-korg