Merge lp://staging/~laney/software-properties/test-fixes into lp://staging/software-properties

Proposed by Iain Lane
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp://staging/~laney/software-properties/test-fixes
Merge into: lp://staging/software-properties
Diff against target: 43 lines (+12/-2)
3 files modified
debian/changelog (+10/-0)
debian/tests/run-tests (+1/-1)
softwareproperties/shortcuts.py (+1/-1)
To merge this branch: bzr merge lp://staging/~laney/software-properties/test-fixes
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Scott Moser Pending
Ubuntu Core Development Team Pending
Review via email: mp+318784@code.staging.launchpad.net

Description of the change

AFAICS the change from https://code.launchpad.net/~smoser/software-properties/trunk.lp1532855/+merge/318132 broke the testsuite.

I think that add_key() needs to return a boolean. The one in ShortcutHandler constantly succeeds, so it seems that it should return True all the time. Please sanity check this.

Also the autopkgtests call gpg1 which isn't installed any more - I think they can just call gpg instead. At least they pass for me like this.

To reproduce, with working lxd:

  $ autopkgtest-build-lxd images:ubuntu/zesty/amd64
  $ autopkgtest --shell-fail -U --apt-pocket=proposed=src:software-properties /path/to/software-properties.dsc -- lxd autopkgtest/ubuntu/zesty/amd64

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Oh, to reproduce the failure, pass 'software-properties' instead of a dsc file (use the dsc to test the fix, or an amd64.changes if that changes file contains source too [e.g. sbuild ... -s]). In that case autopkgtest will get the package from the archive.

Revision history for this message
Iain Lane (laney) wrote :

Would you please review this?

Revision history for this message
Scott Moser (smoser) wrote :

thank you Iain.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: