unittest clean improved

This commit is contained in:
Dirk Alders 2021-03-07 23:53:22 +01:00
parent 7b807e5ca7
commit 2f3de760fc
2 changed files with 4 additions and 18 deletions

17
run.py
View File

@ -26,14 +26,6 @@ except ImportError:
import shutil import shutil
ARG_CLEAN = 'clean'
ARG_RUN = 'run'
ARG_FINALISE = 'finalise'
ARG_TEX = 'tex'
ARG_STATUS = 'status'
ARG_COPY = 'copy'
ARG_RELEASE = 'release'
FN_DATA_COLLECTION = 'unittest.json' FN_DATA_COLLECTION = 'unittest.json'
FN_TEX_REPORT = 'unittest.tex' FN_TEX_REPORT = 'unittest.tex'
FN_PDF_REPORT = 'unittest.pdf' FN_PDF_REPORT = 'unittest.pdf'
@ -161,8 +153,6 @@ class coverage_info(list):
def unittest(options, args, unittest_folder): def unittest(options, args, unittest_folder):
if 'release_testcases' in args: if 'release_testcases' in args:
unittest_release_testcases(unittest_folder) unittest_release_testcases(unittest_folder)
elif 'clean' in args:
unittest_clean(unittest_folder)
elif 'prepare' in args: elif 'prepare' in args:
unittest_prepare(unittest_folder) unittest_prepare(unittest_folder)
elif 'testrun' in args: elif 'testrun' in args:
@ -190,13 +180,6 @@ def unittest_release_testcases(ut_folder):
fh.write(line + '\n') fh.write(line + '\n')
def unittest_clean(ut_folder):
output.print_header('Cleaning up...')
output.print_action('Testresults from last testrun')
for fn in os.listdir(testresults_filename(ut_folder, '')):
remove_file(testresults_filename(ut_folder, fn))
def unittest_prepare(ut_folder): def unittest_prepare(ut_folder):
config = imp.load_source('', jsonlog.get_ut_config(ut_folder)) config = imp.load_source('', jsonlog.get_ut_config(ut_folder))
# #

View File

@ -34,7 +34,10 @@ smoke: testrun_smoke finalise compile status
single: testrun_single finalise compile status single: testrun_single finalise compile status
clean: clean:
@$(PYT3_CMD) src/unittest/scripts/unittest.py clean @echo "\033[1;33mCleaning up...\e[0m"
@echo "\e[1m * Testresults from last testrunx\e[0m"
@ls testresults | xargs -i echo " testresults/{}"
@ls testresults | xargs -i rm -f "testresults/{}"
@echo "\e[1m * Collected coverage information\e[0m" @echo "\e[1m * Collected coverage information\e[0m"
@$(COV3_CMD) erase @$(COV3_CMD) erase