Addressing pull request comments.

-) Fixing long line length.
 -) Changed the logic of the exit message.
pull/37/head
Nicolas Noble 10 years ago
parent 594ef6c3b3
commit b09078f202
  1. 5
      tools/run_tests/jobset.py
  2. 21
      tools/run_tests/run_tests.py

@ -165,7 +165,10 @@ def _never_cancelled():
return False
def run(cmdlines, check_cancelled=_never_cancelled, maxjobs=None, newline_on_success=False):
def run(cmdlines,
check_cancelled=_never_cancelled,
maxjobs=None,
newline_on_success=False):
js = Jobset(check_cancelled,
maxjobs if maxjobs is not None else _DEFAULT_MAX_JOBS,
newline_on_success)

@ -102,12 +102,8 @@ def _build_and_run(check_cancelled, newline_on_success, forever=False):
check_cancelled,
newline_on_success=newline_on_success,
maxjobs=min(c.maxjobs for c in run_configs)):
if not forever:
jobset.message('FAILED', 'Some tests failed', do_newline=True)
return 2
if not forever:
jobset.message('SUCCESS', 'All tests passed', do_newline=True)
return 0
@ -118,12 +114,21 @@ if forever:
initial_time = dw.most_recent_change()
have_files_changed = lambda: dw.most_recent_change() != initial_time
previous_success = success
success = _build_and_run(have_files_changed, newline_on_success=False, forever=True) == 0
success = _build_and_run(have_files_changed,
newline_on_success=False,
forever=True) == 0
if not previous_success and success:
jobset.message('SUCCESS', 'All tests are now passing properly', do_newline=True)
jobset.message('SUCCESS',
'All tests are now passing properly',
do_newline=True)
jobset.message('IDLE', 'No change detected')
while not have_files_changed():
time.sleep(1)
else:
sys.exit(_build_and_run(lambda: False, newline_on_success=args.newline_on_success))
result = _build_and_run(lambda: False,
newline_on_success=args.newline_on_success)
if result == 0:
jobset.message('SUCCESS', 'All tests passed', do_newline=True)
else:
jobset.message('FAILED', 'Some tests failed', do_newline=True)
sys.exit(result)

Loading…
Cancel
Save