Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-18 22:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show versions of autopkgtests if they are all running

Browse Source 
If a particular test is running on all architectures, the tested version is not
very useful and often even wrong, as we can't yet predict which version will
actually be used (sometimes from testing, sometimes from unstable depending on
apt pinning). So only show it once we have at least one result.
This commit is contained in:
Martin Pitt 2016-04-04 17:05:39 +02:00
parent f4ca9d9775
commit cbb79a9171
3 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autopkgtest.py
View File

@ -570,6 +570,9 @@ class AutoPackageTest(object):
Return (passed, src, ver, arch -> Return (passed, src, ver, arch ->
(ALWAYSFAIL|PASS|REGRESSION|IGNORE-FAIL|RUNNING|RUNNING-ALWAYSFAIL, log_url)) (ALWAYSFAIL|PASS|REGRESSION|IGNORE-FAIL|RUNNING|RUNNING-ALWAYSFAIL, log_url))
iterable for all package tests that got triggered by trigsrc/trigver. iterable for all package tests that got triggered by trigsrc/trigver.
ver is None if tests are still running on all architectures, otherwise
the actually tested version of src.
''' '''
# (src, ver) -> arch -> ALWAYSFAIL|PASS|REGRESSION|RUNNING|RUNNING-ALWAYSFAIL # (src, ver) -> arch -> ALWAYSFAIL|PASS|REGRESSION|RUNNING|RUNNING-ALWAYSFAIL
pkg_arch_result = {} pkg_arch_result = {}
@ -637,6 +640,9 @@ class AutoPackageTest(object):
pkg_arch_result.setdefault((testsrc, testver), {})[arch] = (result, url) pkg_arch_result.setdefault((testsrc, testver), {})[arch] = (result, url)
for ((testsrc, testver), arch_results) in pkg_arch_result.items(): for ((testsrc, testver), arch_results) in pkg_arch_result.items():
r = [v[0] for v in arch_results.values()] r = set([v[0] for v in arch_results.values()])
passed = 'REGRESSION' not in r and 'RUNNING' not in r passed = 'REGRESSION' not in r and 'RUNNING' not in r
# skip version if still running on all arches
if not r - {'RUNNING', 'RUNNING-ALWAYSFAIL'}:
testver = None
yield (passed, testsrc, testver, arch_results) yield (passed, testsrc, testver, arch_results)

6
britney.py
View File

@ -1954,7 +1954,11 @@ class Britney(object):
('package', adtsrc), ('package', adtsrc),
('trigger', '%s/%s' % (e.name, e.ver[1]))] + ('trigger', '%s/%s' % (e.name, e.ver[1]))] +
[('ppa', p) for p in self.options.adt_ppas]) [('ppa', p) for p in self.options.adt_ppas])
e.addtest('autopkgtest', '%s %s' % (adtsrc, adtver), if adtver:
testname = '%s %s' % (adtsrc, adtver)
else:
testname = adtsrc
e.addtest('autopkgtest', testname,
arch, status, log_url, **kwargs) arch, status, log_url, **kwargs)
if not passed: if not passed:
adtpass = False adtpass = False

120
tests/test_autopkgtest.py
View File

@ -184,14 +184,13 @@ class T(TestBase):
exc = self.do_test( exc = self.do_test(
[('darkgreen', {'Version': '2'}, 'autopkgtest')], [('darkgreen', {'Version': '2'}, 'autopkgtest')],
{'darkgreen': (True, {'darkgreen 2': {'i386': 'RUNNING-ALWAYSFAIL', {'darkgreen': (True, {'darkgreen': {'i386': 'RUNNING-ALWAYSFAIL', 'amd64': 'RUNNING-ALWAYSFAIL'}})},
'amd64': 'RUNNING-ALWAYSFAIL'}})},
{'darkgreen': [('excuses', 'Valid candidate')]} {'darkgreen': [('excuses', 'Valid candidate')]}
)[1] )[1]
# the test should still be triggered though # the test should still be triggered though
self.assertEqual(exc['darkgreen']['tests'], {'autopkgtest': self.assertEqual(exc['darkgreen']['tests'], {'autopkgtest':
{'darkgreen 2': { {'darkgreen': {
'amd64': ['RUNNING-ALWAYSFAIL', 'amd64': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running.shtml', 'http://autopkgtest.ubuntu.com/running.shtml',
'http://autopkgtest.ubuntu.com/packages/d/darkgreen/series/amd64', 'http://autopkgtest.ubuntu.com/packages/d/darkgreen/series/amd64',
@ -226,9 +225,9 @@ class T(TestBase):
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}) })
}, },
{'green': [('old-version', '1'), ('new-version', '2'), {'green': [('old-version', '1'), ('new-version', '2'),
@ -268,9 +267,9 @@ class T(TestBase):
# first run requests tests and marks them as pending # first run requests tests and marks them as pending
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}) })
}, },
{'green': [('old-version', '1'), ('new-version', '2')]}) {'green': [('old-version', '1'), ('new-version', '2')]})
@ -339,9 +338,9 @@ class T(TestBase):
# first run requests tests and marks them as pending # first run requests tests and marks them as pending
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}) })
}, },
{'green': [('old-version', '1'), ('new-version', '2')]}) {'green': [('old-version', '1'), ('new-version', '2')]})
@ -388,9 +387,9 @@ class T(TestBase):
# none of the above results should be accepted # none of the above results should be accepted
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}) })
}) })
@ -524,10 +523,10 @@ class T(TestBase):
# first run requests tests and marks them as pending # first run requests tests and marks them as pending
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'green64 1': {'amd64': 'RUNNING'}, 'green64': {'amd64': 'RUNNING'},
}) })
}) })
@ -780,9 +779,9 @@ class T(TestBase):
self.data.add_src('lightgreen', True, {'Version': '2', 'Testsuite': 'autopkgtest'}) self.data.add_src('lightgreen', True, {'Version': '2', 'Testsuite': 'autopkgtest'})
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
'lightgreen': (False, {}), 'lightgreen': (False, {}),
}, },
@ -836,11 +835,11 @@ class T(TestBase):
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest'), [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest'),
('lightgreen', {'Version': '2', 'Depends': 'libgreen1 (>= 2)'}, 'autopkgtest')], ('lightgreen', {'Version': '2', 'Depends': 'libgreen1 (>= 2)'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
'lightgreen': (False, {'lightgreen 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}), 'lightgreen': (False, {'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}),
}, },
{'green': [('old-version', '1'), ('new-version', '2')], {'green': [('old-version', '1'), ('new-version', '2')],
'lightgreen': [('old-version', '1'), ('new-version', '2')], 'lightgreen': [('old-version', '1'), ('new-version', '2')],
@ -871,9 +870,9 @@ class T(TestBase):
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'newgreen', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'newgreen', 'Depends': 'libc6'}, 'autopkgtest')],
{'newgreen': (True, {'newgreen 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, {'newgreen': (True, {'newgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
}, },
{'newgreen': [('old-version', '-'), ('new-version', '2')]}) {'newgreen': [('old-version', '-'), ('new-version', '2')]})
@ -922,7 +921,7 @@ class T(TestBase):
self.do_test( self.do_test(
[('darkgreen', {'Version': '2', 'Depends': 'libc6 (>= 0.9), libgreen1'}, 'autopkgtest')], [('darkgreen', {'Version': '2', 'Depends': 'libc6 (>= 0.9), libgreen1'}, 'autopkgtest')],
{'darkgreen': (False, {'darkgreen 2': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})}) {'darkgreen': (False, {'darkgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
self.assertEqual( self.assertEqual(
self.amqp_requests, self.amqp_requests,
@ -946,7 +945,7 @@ class T(TestBase):
self.data.remove_all(True) self.data.remove_all(True)
self.do_test( self.do_test(
[('darkgreen', {'Version': '3', 'Depends': 'libc6 (>= 0.9), libgreen1'}, 'autopkgtest')], [('darkgreen', {'Version': '3', 'Depends': 'libc6 (>= 0.9), libgreen1'}, 'autopkgtest')],
{'darkgreen': (False, {'darkgreen 3': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})}) {'darkgreen': (False, {'darkgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
self.assertEqual( self.assertEqual(
self.amqp_requests, self.amqp_requests,
set(['debci-series-i386:darkgreen {"triggers": ["darkgreen/3"]}', set(['debci-series-i386:darkgreen {"triggers": ["darkgreen/3"]}',
@ -983,9 +982,9 @@ class T(TestBase):
# second run: new version re-triggers all tests # second run: new version re-triggers all tests
self.do_test( self.do_test(
[('libgreen1', {'Version': '3', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '3', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 3': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, 'lightgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
'darkgreen 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, 'darkgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
}), }),
}) })
@ -1007,7 +1006,7 @@ class T(TestBase):
[], [],
{'green': (False, {'green 3': {'amd64': 'PASS', 'i386': 'PASS'}, {'green': (False, {'green 3': {'amd64': 'PASS', 'i386': 'PASS'},
'lightgreen 1': {'amd64': 'PASS', 'i386': 'PASS'}, 'lightgreen 1': {'amd64': 'PASS', 'i386': 'PASS'},
'darkgreen 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, 'darkgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
}), }),
}) })
self.assertEqual(self.amqp_requests, set()) self.assertEqual(self.amqp_requests, set())
@ -1040,7 +1039,7 @@ class T(TestBase):
# first run: no results yet # first run: no results yet
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green'}, 'autopkgtest')],
{'green': (False, {'darkgreen 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})}) {'green': (False, {'darkgreen': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
# second run: i386 result has version 1.1 # second run: i386 result has version 1.1
self.swift.set_results({'autopkgtest-series': { self.swift.set_results({'autopkgtest-series': {
@ -1048,7 +1047,7 @@ class T(TestBase):
}}) }})
self.do_test( self.do_test(
[], [],
{'green': (False, {'darkgreen 1': {'amd64': 'RUNNING'}, {'green': (False, {'darkgreen': {'amd64': 'RUNNING'},
'darkgreen 1.1': {'i386': 'PASS'}, 'darkgreen 1.1': {'i386': 'PASS'},
})}) })})
@ -1062,7 +1061,6 @@ class T(TestBase):
'darkgreen 1.1': {'i386': 'PASS'}, 'darkgreen 1.1': {'i386': 'PASS'},
})}) })})
def test_tmpfail(self): def test_tmpfail(self):
'''tmpfail results''' '''tmpfail results'''
@ -1245,8 +1243,8 @@ class T(TestBase):
self.do_test( self.do_test(
[('lightgreen', {'Version': '2'}, 'autopkgtest')], [('lightgreen', {'Version': '2'}, 'autopkgtest')],
{'lightgreen': (False, {'lightgreen 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'lightgreen': (False, {'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'rainbow 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'rainbow': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
}, },
{'lightgreen': [('old-version', '1'), ('new-version', '2')]} {'lightgreen': [('old-version', '1'), ('new-version', '2')]}
@ -1261,9 +1259,9 @@ class T(TestBase):
self.data.add('liboldgreen1', True, add_src=False) self.data.add('liboldgreen1', True, add_src=False)
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green'}, 'autopkgtest')],
{'green': (True, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, {'green': (True, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
}, },
{'green': [('old-version', '1'), ('new-version', '2')]}) {'green': [('old-version', '1'), ('new-version', '2')]})
@ -1437,7 +1435,7 @@ class T(TestBase):
self.do_test( self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (True, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'REGRESSION'}, {'green': (True, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'REGRESSION'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'PASS', 'i386': 'PASS'}, 'darkgreen 1': {'amd64': 'PASS', 'i386': 'PASS'},
}), }),
}, },
@ -1457,9 +1455,9 @@ class T(TestBase):
self.create_hint('pitti', 'force-skiptest green/1') self.create_hint('pitti', 'force-skiptest green/1')
exc = self.do_test( exc = self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
{'green': (False, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'green': (False, {'green': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'darkgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
}, },
{'green': [('reason', 'autopkgtest')]} {'green': [('reason', 'autopkgtest')]}
@ -1482,7 +1480,7 @@ class T(TestBase):
self.do_test( self.do_test(
[('dkms', {'Version': '2'}, None)], [('dkms', {'Version': '2'}, None)],
{'dkms': (False, {'fancy 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}})}, {'dkms': (False, {'fancy': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}})},
{'dkms': [('old-version', '1'), ('new-version', '2')]}) {'dkms': [('old-version', '1'), ('new-version', '2')]})
def test_kernel_triggers_dkms(self): def test_kernel_triggers_dkms(self):
@ -1496,9 +1494,9 @@ class T(TestBase):
('linux-image-grumpy-generic', {'Source': 'linux-meta-lts-grumpy'}, None), ('linux-image-grumpy-generic', {'Source': 'linux-meta-lts-grumpy'}, None),
('linux-image-64only', {'Source': 'linux-meta-64only', 'Architecture': 'amd64'}, None), ('linux-image-64only', {'Source': 'linux-meta-64only', 'Architecture': 'amd64'}, None),
], ],
{'linux-meta': (True, {'fancy 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}), {'linux-meta': (True, {'fancy': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}),
'linux-meta-lts-grumpy': (True, {'fancy 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}), 'linux-meta-lts-grumpy': (True, {'fancy': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}}),
'linux-meta-64only': (True, {'fancy 1': {'amd64': 'RUNNING-ALWAYSFAIL'}}), 'linux-meta-64only': (True, {'fancy': {'amd64': 'RUNNING-ALWAYSFAIL'}}),
}) })
# one separate test should be triggered for each kernel # one separate test should be triggered for each kernel
@ -1602,12 +1600,12 @@ class T(TestBase):
('linux-image-2', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'), ('linux-image-2', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'),
('linux-libc-dev', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'), ('linux-libc-dev', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'),
], ],
{'linux-meta': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING-ALWAYSFAIL'}, {'linux-meta': (False, {'lxc': {'amd64': 'RUNNING', 'i386': 'RUNNING-ALWAYSFAIL'},
'glibc 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'glibc': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'linux 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'linux': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'systemd 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'systemd': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
'linux-meta-64only': (False, {'lxc 1': {'amd64': 'RUNNING'}}), 'linux-meta-64only': (False, {'lxc': {'amd64': 'RUNNING'}}),
'linux': (False, {}), 'linux': (False, {}),
})[1] })[1]
# the kernel itself should not trigger tests; we want to trigger # the kernel itself should not trigger tests; we want to trigger
@ -1636,7 +1634,7 @@ class T(TestBase):
('linux-image-2', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'), ('linux-image-2', {'Version': '2', 'Source': 'linux'}, 'autopkgtest'),
('linux-firmware', {'Version': '2', 'Source': 'linux-firmware'}, 'autopkgtest'), ('linux-firmware', {'Version': '2', 'Source': 'linux-firmware'}, 'autopkgtest'),
], ],
{'linux-meta': (False, {'fancy 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'linux-meta': (False, {'fancy': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'linux 2': {'amd64': 'PASS', 'i386': 'PASS'} 'linux 2': {'amd64': 'PASS', 'i386': 'PASS'}
}), }),
# no tests, but should wait on linux-meta # no tests, but should wait on linux-meta
@ -1683,8 +1681,8 @@ class T(TestBase):
exc = self.do_test( exc = self.do_test(
[('libgcc1', {'Source': 'gcc-5', 'Version': '2'}, None)], [('libgcc1', {'Source': 'gcc-5', 'Version': '2'}, None)],
{'gcc-5': (False, {'binutils 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}, {'gcc-5': (False, {'binutils': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'},
'linux 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}})})[1] 'linux': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}})})[1]
self.assertNotIn('notme 1', exc['gcc-5']['tests']['autopkgtest']) self.assertNotIn('notme 1', exc['gcc-5']['tests']['autopkgtest'])
def test_alternative_gcc(self): def test_alternative_gcc(self):
@ -1733,11 +1731,11 @@ class T(TestBase):
exc = self.do_test( exc = self.do_test(
[('lightgreen', {'Version': '2'}, 'autopkgtest')], [('lightgreen', {'Version': '2'}, 'autopkgtest')],
{'lightgreen': (True, {'lightgreen 2': {'amd64': 'RUNNING-ALWAYSFAIL'}})}, {'lightgreen': (True, {'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL'}})},
{'lightgreen': [('old-version', '1'), ('new-version', '2')]} {'lightgreen': [('old-version', '1'), ('new-version', '2')]}
)[1] )[1]
self.assertEqual(exc['lightgreen']['tests'], {'autopkgtest': self.assertEqual(exc['lightgreen']['tests'], {'autopkgtest':
{'lightgreen 2': { {'lightgreen': {
'amd64': ['RUNNING-ALWAYSFAIL', 'amd64': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running.shtml', 'http://autopkgtest.ubuntu.com/running.shtml',
None, None,