From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 5 Sep 2020 14:24:37 +0000 (+0200)
Subject: Protect mts vs py2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F71893%2F1;p=functest-xtesting.git

Protect mts vs py2

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

diff --git a/xtesting/core/mts.py b/xtesting/core/mts.py
index a5cc6a1d..0c861e90 100644
--- a/xtesting/core/mts.py
+++ b/xtesting/core/mts.py
@@ -24,6 +24,7 @@ import time
 
 from lxml import etree
 import prettytable
+import six
 
 from xtesting.core import testcase
 
@@ -227,14 +228,17 @@ class MTSLauncher(testcase.TestCase):
                     if console:
                         sys.stdout.write(line.decode("utf-8"))
                     f_stdout.write(line.decode("utf-8"))
-                try:
-                    process.wait(timeout=max_duration)
-                except subprocess.TimeoutExpired:
-                    process.kill()
-                    self.__logger.info(
-                        "Killing MTS process after %d second(s).",
-                        max_duration)
-                    return 3
+                if six.PY3:
+                    try:
+                        process.wait(timeout=max_duration)
+                    except subprocess.TimeoutExpired:
+                        process.kill()
+                        self.__logger.info(
+                            "Killing MTS process after %d second(s).",
+                            max_duration)
+                        return 3
+                else:
+                    process.wait()
             with open(self.result_file, 'r') as f_stdin:
                 self.__logger.debug("$ %s\n%s", cmd, f_stdin.read().rstrip())
             return process.returncode