britney

Merge ~vorlon/britney/+git/britney2-ubuntu:autopkgtest-test-fixes into ~ubuntu-release/britney/+git/britney2-ubuntu:master

  1. Git
  2. lp:~vorlon/britney/+git/britney2-ubuntu
  3. autopkgtest-test-fixes
  4. Merge into master
Proposed by Steve Langasek
Status: Merged
Merged at revision: bf26a09948a9bd730c4d3bb4acfef481faa30ce2
Proposed branch: ~vorlon/britney/+git/britney2-ubuntu:autopkgtest-test-fixes
Merge into: ~ubuntu-release/britney/+git/britney2-ubuntu:master
Prerequisite: ~vorlon/britney/+git/britney2-ubuntu:master
Diff against target: 56 lines (+2/-8)
1 file modified
tests/test_autopkgtest.py (+2/-8)
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+355423@code.launchpad.net

Description of the change

Fix failures in the tests for the autopkgtest policy.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
2index 9ceef92..2e48301 100755
3--- a/tests/test_autopkgtest.py
4+++ b/tests/test_autopkgtest.py
5@@ -199,7 +199,6 @@ class T(TestBase):
6 {'lightgreen': (False, {})},
7 {'lightgreen': [('old-version', '1'), ('new-version', '1.1~beta'),
8 ('reason', 'depends'),
9- ('excuses', 'lightgreen/amd64 unsatisfiable Depends: libgreen1 (>= 2)')
10 ]
11 })[1]
12 # autopkgtest should not be triggered for uninstallable pkg
13@@ -830,8 +829,7 @@ class T(TestBase):
14 },
15 {'green': [('old-version', '1'), ('new-version', '2')],
16 'brokengreen': [('old-version', '-'), ('new-version', '1'),
17- ('reason', 'depends'),
18- ('excuses', 'brokengreen/amd64 unsatisfiable Depends: nonexisting')],
19+ ('reason', 'depends')],
20 })[1]
21 # autopkgtest should not be triggered for uninstallable pkg
22 self.assertEqual(exc['brokengreen']['policy_info']['autopkgtest'], {})
23@@ -1476,7 +1474,6 @@ class T(TestBase):
24 {'lightgreen': (False, {})},
25 {'lightgreen': [('old-version', '1'), ('new-version', '0.9~beta'),
26 ('reason', 'newerintesting'),
27- ('excuses', 'ALERT: lightgreen is newer in testing (1 0.9~beta)')
28 ]
29 })[1]
30
31@@ -1719,8 +1716,7 @@ class T(TestBase):
32 }),
33 },
34 {'green': [('old-version', '1'), ('new-version', '2'),
35- ('forced-reason', 'skiptest'),
36- ('excuses', 'Should wait for tests relating to green 2, but forced by pitti')]
37+ ('forced-reason', 'skiptest')]
38 })
39
40 def test_hint_force_skiptest_different_version(self):
41@@ -1782,7 +1778,6 @@ class T(TestBase):
42 [('darkgreen', {'Version': '2'}, 'autopkgtest')],
43 {'darkgreen': (False, {'darkgreen': {'i386': 'RUNNING-ALWAYSFAIL', 'amd64': 'RUNNING-ALWAYSFAIL'}})},
44 {'darkgreen': [('reason', 'block'),
45- ('excuses', 'Not touching package as requested in <a href="https://launchpad.net/bugs/12345">bug 12345</a> on Thu Aug 18 07:23:20 2016'),
46 ('is-candidate', False),
47 ]
48 }
49@@ -1970,7 +1965,6 @@ class T(TestBase):
50 'linux-firmware': (True, {'linux-firmware/2': {'amd64': 'PASS', 'i386': 'PASS'}}),
51 },
52 {'linux': [('reason', 'depends'),
53- ('excuses', 'Invalidated by dependency'),
54 ('dependencies', {'blocked-by': ['linux-meta']})]
55 }
56 )

Subscribers

People subscribed via source and target branches