Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-13 19:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make force-badtest hints apply to lower versions

Browse Source 
We usually bump force-badtest versions for the devel series, which can cause
apparent regressions in stable tests, or when running tests against
devel-release when bumping the version for devel-proposed.
This commit is contained in:
Martin Pitt 2016-05-09 10:26:34 +02:00
parent 0d0c9f3592
commit e43cec8fad
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autopkgtest.py
View File

@ -610,7 +610,7 @@ class AutoPackageTest(object):
self.log_verbose('Checking hints for %s/%s/%s: %s' % (testsrc, testver, arch, [str(h) for h in hints])) self.log_verbose('Checking hints for %s/%s/%s: %s' % (testsrc, testver, arch, [str(h) for h in hints]))
for hint in hints: for hint in hints:
if [mi for mi in hint.packages if mi.architecture in ['source', arch] and if [mi for mi in hint.packages if mi.architecture in ['source', arch] and
(mi.version == 'all' or same_source(mi.version, testver))]: (mi.version == 'all' or apt_pkg.version_compare(testver, mi.version) <= 0)]:
result = 'IGNORE-FAIL' result = 'IGNORE-FAIL'
break break
else: else:

13
tests/test_autopkgtest.py
View File

@ -1368,6 +1368,7 @@ class T(TestBase):
'series/amd64/g/green/20150101_100200@': (0, 'green 2', tr('green/2')), 'series/amd64/g/green/20150101_100200@': (0, 'green 2', tr('green/2')),
}}) }})
# lower hint version should not apply
self.create_hint('pitti', 'force-badtest lightgreen/0.1') self.create_hint('pitti', 'force-badtest lightgreen/0.1')
exc = self.do_test( exc = self.do_test(
@ -1381,6 +1382,18 @@ class T(TestBase):
)[1] )[1]
self.assertNotIn('forced-reason', exc['green']) self.assertNotIn('forced-reason', exc['green'])
# higher hint version should apply
self.create_hint('pitti', 'force-badtest lightgreen/3')
self.do_test(
[],
{'green': (True, {'green 2': {'amd64': 'PASS', 'i386': 'PASS'},
'lightgreen 1': {'amd64': 'IGNORE-FAIL', 'i386': 'IGNORE-FAIL'},
'darkgreen 1': {'amd64': 'PASS', 'i386': 'PASS'},
}),
},
{}
)
def test_hint_force_badtest_arch(self): def test_hint_force_badtest_arch(self):
'''force-badtest hint for architecture instead of version''' '''force-badtest hint for architecture instead of version'''