From: Zack Cerza Date: Thu, 5 Nov 2015 20:04:10 +0000 (-0700) Subject: More consistent spacing between sections X-Git-Tag: 1.1.0~762^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F699%2Fhead;p=teuthology.git More consistent spacing between sections Signed-off-by: Zack Cerza --- diff --git a/teuthology/results.py b/teuthology/results.py index b5e210cd7..422aaab38 100644 --- a/teuthology/results.py +++ b/teuthology/results.py @@ -223,7 +223,7 @@ def format_job(run_name, job): reason = \ '\n'.join((' ') + line for line in reason.splitlines()) reason_lines = email_templates['fail_reason_templ'].format( - reason=reason) + reason=reason).rstrip() else: reason_lines = '' @@ -261,6 +261,7 @@ email_templates = { {fail_sect}{dead_sect}{running_sect}{waiting_sect}{queued_sect}{pass_sect} """), 'sect_templ': dedent("""\ + {title} ================================================================= {jobs} @@ -277,6 +278,7 @@ email_templates = { 'fail_reason_templ': "\n\n{reason}\n", 'running_templ': dedent("""\ [{job_id}] {desc}{info_line} + """), 'pass_templ': dedent("""\ [{job_id}] {desc} diff --git a/teuthology/test/test_results.py b/teuthology/test/test_results.py index 6dab00afb..78022d7f9 100644 --- a/teuthology/test/test_results.py +++ b/teuthology/test/test_results.py @@ -84,6 +84,7 @@ class TestResultsEmail(object): queued: 1 passed: 1 + Fail ================================================================= [88979] description for job with name test_name @@ -113,16 +114,22 @@ class TestResultsEmail(object): [30481] description for job with name test_name info: http://example.com/test_name/30481/ + + Waiting ================================================================= [62965] description for job with name test_name info: http://example.com/test_name/62965/ + + Queued ================================================================= [79063] description for job with name test_name info: http://example.com/test_name/79063/ + + Pass ================================================================= [68369] description for job with name test_name