Merge lp:~apw/ubuntu-archive-tools/copy-proposed-kernels-routing-updates-2 into lp:ubuntu-archive-tools

Proposed by Andy Whitcroft
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 1219
Merged at revision: 1220
Proposed branch: lp:~apw/ubuntu-archive-tools/copy-proposed-kernels-routing-updates-2
Merge into: lp:ubuntu-archive-tools
Diff against target: 37 lines (+19/-1)
1 file modified
copy-proposed-kernel (+19/-1)
To merge this branch: bzr merge lp:~apw/ubuntu-archive-tools/copy-proposed-kernels-routing-updates-2
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+368383@code.launchpad.net

Commit message

Ensure all of the packages in the precise/linux set are routed the same way.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good, no typos in sight!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'copy-proposed-kernel'
2--- copy-proposed-kernel 2019-05-22 09:31:08 +0000
3+++ copy-proposed-kernel 2019-06-05 11:19:59 +0000
4@@ -236,6 +236,24 @@
5 self.assertIn('from and to ESM', out.getvalue().strip())
6 self.assertNotIn('via signing', out.getvalue().strip())
7
8+ def test_esm_precise_linux_meta(self):
9+ results = self.FakeArgs(series='precise', source='linux-meta')
10+ expected = copy(results).update(esm=True)
11+ with self.capture() as (out, err):
12+ auto_route(results)
13+ self.assertEqual(expected.__dict__, results.__dict__)
14+ self.assertIn('from and to ESM', out.getvalue().strip())
15+ self.assertNotIn('via signing', out.getvalue().strip())
16+
17+ def test_esm_precise_lbm(self):
18+ results = self.FakeArgs(series='precise', source='linux-backports-modules-3.2.0')
19+ expected = copy(results).update(esm=True)
20+ with self.capture() as (out, err):
21+ auto_route(results)
22+ self.assertEqual(expected.__dict__, results.__dict__)
23+ self.assertIn('from and to ESM', out.getvalue().strip())
24+ self.assertNotIn('via signing', out.getvalue().strip())
25+
26 def test_esm_precise_linux_lts_trusty(self):
27 results = self.FakeArgs(series='precise', source='linux-lts-trusty')
28 expected = copy(results).update(esm=True, to_signing=True)
29@@ -296,7 +314,7 @@
30 if args.series in ('precise', 'trusty'):
31 args.esm = True
32 if args.esm:
33- if (args.series == 'precise' and args.source in ('linux', 'linux-meta') or
34+ if (args.series == 'precise' and args.source in ('linux', 'linux-meta', 'linux-backports-modules-3.2.0') or
35 args.series == 'trusty' and args.source in ('linux-aws', 'linux-meta-aws')):
36 args.to_signing = False
37 else:

Subscribers

People subscribed via source and target branches