From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 9 Jan 2024 13:36:30 +0000 (+0100)
Subject: Fix pylint issues in netperf
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F74431%2F1;p=functest-kubernetes.git

Fix pylint issues in netperf

Change-Id: I47eac42fd30e857e2a94a7b5caa5850b3c7c9196
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e98c46bdcc7087b55ce0339111c7bedc450e94b0)
---

diff --git a/functest_kubernetes/netperf/netperf.py b/functest_kubernetes/netperf/netperf.py
index b3642085..7832e6d1 100644
--- a/functest_kubernetes/netperf/netperf.py
+++ b/functest_kubernetes/netperf/netperf.py
@@ -60,9 +60,10 @@ class Netperf(testcase.TestCase):
             self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
             self.result = 100
             status = testcase.TestCase.EX_OK
-        except subprocess.SubprocessError as exc:
+        except (subprocess.TimeoutExpired,
+                subprocess.CalledProcessError) as exc:
             self.__logger.exception(
-                "Cannot run Netperf:\n%s", ' '.join(exc.cmd),
+                "Cannot run %s:\n%s", ' '.join(exc.cmd),
                 exc.output.decode("utf-8"))
             self.result = 0
             status = testcase.TestCase.EX_RUN_ERROR