valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failed tests re-run logic

Browse Source
This commit is contained in:
Pedro Algarvio 2019-04-07 19:19:18 +01:00
parent d6d8db119b
commit 8b7105e1f9
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
noxfile.py
View File

@ -228,13 +228,6 @@ def _runtests(session, coverage, transport, cmd_args):
session.run('python', os.path.join('tests', 'runtests.py'), *cmd_args) session.run('python', os.path.join('tests', 'runtests.py'), *cmd_args)
except CommandFailed: except CommandFailed:
names_file_path = os.path.join('artifacts', 'failed-tests.txt') names_file_path = os.path.join('artifacts', 'failed-tests.txt')
if not os.path.exists(names_file_path):
# raise the original exception
raise
with open(names_file_path) as rfh:
if not rfh.read():
# raise the original exception
raise
session.log('Re-running failed tests if possible') session.log('Re-running failed tests if possible')
session.install('xunitparser==1.3.3') session.install('xunitparser==1.3.3')
session.run( session.run(
@ -243,10 +236,22 @@ def _runtests(session, coverage, transport, cmd_args):
names_file_path names_file_path
) )
if not os.path.exists(names_file_path): if not os.path.exists(names_file_path):
session.error('No names file was generated to re-run tests') session.log(
'Failed tests file(%s) was not found. Not rerunning failed tests.',
names_file_path
)
# raise the original exception
raise
with open(names_file_path) as rfh: with open(names_file_path) as rfh:
failed_tests_count = len(rfh.read().splitlines()) contents = rfh.read().strip()
if not contents:
session.log(
'The failed tests file(%s) is empty. Not rerunning failed tests.',
names_file_path
)
# raise the original exception
raise
failed_tests_count = len(contents.splitlines())
if failed_tests_count > 500: if failed_tests_count > 500:
# 500 test failures?! Something else must have gone wrong, don't even bother # 500 test failures?! Something else must have gone wrong, don't even bother
session.error( session.error(