Merge "Don't include recheck instructions when unclassified failures"

This commit is contained in:
Jenkins 2014-04-08 11:32:22 +00:00 committed by Gerrit Code Review
commit 9eabe7df0f
2 changed files with 4 additions and 9 deletions

View File

@ -134,9 +134,7 @@ class FailEvent(object):
bug_map = {}
for job in self.failed_jobs:
if len(job.bugs) is 0:
# we only care about fails with missing bugs in the gate
if self.queue() == "gate":
bug_map[job.name] = None
bug_map[job.name] = None
else:
bug_map[job.name] = ' '.join(self.bug_urls(job.bugs))
bug_list = []
@ -150,10 +148,6 @@ class FailEvent(object):
def is_fully_classified(self):
if self.get_all_bugs() is None:
return True
# we consider anything that's not in the gate queue
# fully classified, because errors are expected
if self.queue() != "gate":
return True
for job in self.failed_jobs:
if len(job.bugs) is 0:
return False

View File

@ -178,10 +178,11 @@ class TestStream(tests.TestCase):
self.assertEqual(event.bug_urls(),
['https://bugs.launchpad.net/bugs/123456'])
self.assertEqual(event.bug_urls_map(),
['gate-keystone-python26: '
['gate-keystone-python27: unrecognized error',
'gate-keystone-python26: '
'https://bugs.launchpad.net/bugs/123456'])
self.assertEqual(sorted(event.failed_job_names()),
['gate-keystone-python26',
'gate-keystone-python27'])
self.assertEqual(event.get_all_bugs(), ['123456'])
self.assertTrue(event.is_fully_classified())
self.assertFalse(event.is_fully_classified())