Merge lp:~mvo/aptdaemon/test-fixes into lp:aptdaemon

Proposed by Michael Vogt
Status: Needs review
Proposed branch: lp:~mvo/aptdaemon/test-fixes
Merge into: lp:aptdaemon
Diff against target: 34 lines (+3/-3)
2 files modified
tests/test_debconf.py (+1/-1)
tests/test_pk.py (+2/-2)
To merge this branch: bzr merge lp:~mvo/aptdaemon/test-fixes
Reviewer Review Type Date Requested Status
Aptdaemon Developers Pending
Review via email: mp+128697@code.launchpad.net

Description of the change

Two test fixes from Colin Watson that are part of the Ubuntu version
of aptdaemon

To post a comment you must log in.

Unmerged revisions

868. By Michael Vogt

merge patch from Colin Watson to fix test by setting the debconf priority to high

867. By Michael Vogt

merge patch from Colin Watson to fix tests with the latest python-apt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_debconf.py'
2--- tests/test_debconf.py 2012-05-13 02:29:00 +0000
3+++ tests/test_debconf.py 2012-10-09 12:55:27 +0000
4@@ -32,7 +32,7 @@
5 self.proxy.start()
6
7 def _set_input_value(self, template="aptdaemon/test", value="lalelu"):
8-
9+ os.environ["DEBIAN_PRIORITY"] = "high"
10 os.environ["EDITOR"] = "sed -ie 's/\\(%s=\\).*/\\1\\\"%s\\\"/i'" % \
11 (template.replace("/", "\\/"), value)
12
13
14=== modified file 'tests/test_pk.py'
15--- tests/test_pk.py 2012-08-23 12:41:59 +0000
16+++ tests/test_pk.py 2012-10-09 12:55:27 +0000
17@@ -426,7 +426,7 @@
18
19 # now add one
20 client = pk.Client()
21- res = client.install_signature(pk.SigTypeEnum.GPG, 'CF982D18', '', None,
22+ res = client.install_signature(pk.SigTypeEnum.GPG, 'D0BF65B7DBE28DB62BEDBF1B683C53C7CF982D18', '', None,
23 lambda p, t, d: True, None)
24 self.assertEqual(res.get_exit_code(), pk.ExitEnum.SUCCESS)
25
26@@ -441,7 +441,7 @@
27 client = pk.Client()
28 client.set_locale("C")
29 try:
30- client.install_signature(pk.SigTypeEnum.GPG, '11111111', '', None,
31+ client.install_signature(pk.SigTypeEnum.GPG, '1111111111111111111111111111111111111111', '', None,
32 lambda p, t, d: True, None)
33 except GLib.GError as e:
34 self.assertTrue('Failed to download' in str(e), e)

Subscribers

People subscribed via source and target branches

to status/vote changes: