diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-09-05 16:24:37 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-09 19:28:34 +0100 |
| commit | c911f6a0420e42945def4a8b03baaf59d4420ef2 (patch) | |
| tree | f5cd0f5c55fa69a438332a80f32d774278df4970 | |
| parent | bb5230107de32351d1e5d9a9ccc3273a2c1b6369 (diff) | |
Protect mts vs py2
Change-Id: I7a9aa9267a81161b10b1d625efbaa924187f8690
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit cd0f0900cb9290f2e84ad184842d8d8ce543a2e7)
| -rw-r--r-- | xtesting/core/mts.py | 20 |
1 files changed, 12 insertions, 8 deletions
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 |