Merge ~juliank/britney/+git/britney2-ubuntu:check-new-migration-reference into ~ubuntu-release/britney/+git/britney2-ubuntu:master

Proposed by Julian Andres Klode
Status: Merged
Merged at revision: e7eae446b699e47550cb21667610f37b0bc91da8
Proposed branch: ~juliank/britney/+git/britney2-ubuntu:check-new-migration-reference
Merge into: ~ubuntu-release/britney/+git/britney2-ubuntu:master
Diff against target: 27 lines (+15/-1)
1 file modified
britney2/policies/autopkgtest.py (+15/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+411463@code.launchpad.net

Description of the change

Not entirely sure we need this - it just might be delayed by one run. Where we call the function, a few lines later we check if we ever passed before and that works (?). Maybe we just got unlucky on the firs run.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Julian Andres Klode (juliank) :
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
2index 7f970be..e87cecc 100644
3--- a/britney2/policies/autopkgtest.py
4+++ b/britney2/policies/autopkgtest.py
5@@ -1228,7 +1228,21 @@ class AutopkgtestPolicy(BasePolicy):
6 result_reference = [Result.NONE, None, '', 0]
7 if self.options.adt_baseline == 'reference':
8 try:
9- result_reference = self.test_results[REF_TRIG][src][arch]
10+ try:
11+ result_reference = self.test_results[REF_TRIG][src][arch]
12+ except KeyError:
13+ uses_swift = not self.options.adt_swift_url.startswith('file://')
14+ # Without swift or autopkgtest.db we don't expect new results
15+ if hasattr(self,'db'):
16+ self.logger.info('Checking for new results for %s/%s for trigger %s', src, arch, REF_TRIG)
17+ self.fetch_sqlite_results(src, arch)
18+ elif uses_swift:
19+ self.logger.info('Checking for new results for %s/%s for trigger %s', src, arch, REF_TRIG)
20+ self.fetch_swift_results(self.options.adt_swift_url, src, arch)
21+
22+ # do we have one now?
23+ result_reference = self.test_results[REF_TRIG][src][arch]
24+
25 self.logger.debug('Found result for src %s in reference: %s',
26 src, result_reference[0].name)
27 except KeyError:

Subscribers

People subscribed via source and target branches