diff options
| author |   Vincent Mahe <v.mahe@orange.com> | 2020-09-15 17:41:38 +0200 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-09 19:30:12 +0100 |
| commit | 0cff40e97dd54dab199e32be7aa28e620aa1a93d (patch) | |
| tree | 72fea551780bbae06a4259e0987dfa9ce3de9469 | |
| parent | c911f6a0420e42945def4a8b03baaf59d4420ef2 (diff) | |
Cleanup previous run output files
Signed-off-by: Vincent Mahe <v.mahe@orange.com>
Change-Id: I9ec39012457ae1a5f7017d41d79237d7a1e300d4
(cherry picked from commit 43d5772accb16742f09ddbc3d89ff5c315a2c0a4)
| -rw-r--r-- | docker/mts/Dockerfile | 2 | ||||
| -rw-r--r-- | xtesting/ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | xtesting/core/mts.py | 17 |
3 files changed, 15 insertions, 6 deletions
diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile index e7c3d5e4..4d22ffb8 100644 --- a/docker/mts/Dockerfile +++ b/docker/mts/Dockerfile @@ -20,5 +20,5 @@ RUN apk --no-cache add --update openjdk8-jre && \ java -jar target/mts-${MTS_TAG}-installer.jar -options /src/mts-installer.properties) && \ rm -rf /root/.m2/ ${APP_FOLDER}/tutorial /src/mts-installer.properties /src/git-mts && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/xtesting/ci/testcases.yaml b/xtesting/ci/testcases.yaml index f987ee59..bc7203b7 100644 --- a/xtesting/ci/testcases.yaml +++ b/xtesting/ci/testcases.yaml @@ -77,7 +77,7 @@ tiers: name: 'behaveframework' args: suites: - - /usr/lib/python3.6/site-packages/xtesting/samples/features/ + - /usr/lib/python2.7/site-packages/xtesting/samples/features/ tags: - foo diff --git a/xtesting/core/mts.py b/xtesting/core/mts.py index 0c861e90..a7ec9d23 100644 --- a/xtesting/core/mts.py +++ b/xtesting/core/mts.py @@ -18,6 +18,7 @@ helpers to run any python method or any bash command. import csv import logging import os +import shutil import subprocess import sys import time @@ -209,10 +210,18 @@ class MTSLauncher(testcase.TestCase): self.mts_logs_dir) # Make sure to create the necessary output sub-folders for MTS - if not os.path.isdir(self.mts_stats_dir): - os.makedirs(self.mts_stats_dir) - if not os.path.isdir(self.mts_logs_dir): - os.makedirs(self.mts_logs_dir) + # and cleanup output files from previous run. + if os.path.exists(self.mts_result_csv_file): + os.remove(self.mts_result_csv_file) + + if os.path.isdir(self.mts_stats_dir): + shutil.rmtree(self.mts_stats_dir) + os.makedirs(self.mts_stats_dir) + + if os.path.isdir(self.mts_logs_dir): + shutil.rmtree(self.mts_logs_dir) + os.makedirs(self.mts_logs_dir) + self.__logger.info( "MTS statistics output dir: %s ", self.mts_stats_dir) self.__logger.info("MTS logs output dir: %s ", self.mts_logs_dir) |