apt-clone

Merge lp:~jibel/apt-clone/adt-fixes into lp:ubuntu/raring/apt-clone

  1. adt-fixes
  2. Merge into raring
Proposed by Jean-Baptiste Lallement
Status: Merged
Merged at revision: 18
Proposed branch: lp:~jibel/apt-clone/adt-fixes
Merge into: lp:ubuntu/raring/apt-clone
Diff against target: 45 lines (+12/-1)
3 files modified
debian/changelog (+9/-0)
debian/control (+1/-0)
tests/Makefile (+2/-1)
To merge this branch: bzr merge lp:~jibel/apt-clone/adt-fixes
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+139702@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Looks good to me, thanks! Perhaps you can mention in changelog why you redirected stderr, is it writing something to stderr which is supposed to be there, or is this working around an error message/warning?

review: Approve
lp:~jibel/apt-clone/adt-fixes updated
19. By Jean-Baptiste Lallement

Added comment about test redirection

Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Also if the test is run with unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
the following warnings are still going to stderr:
WARNING:root:can't add notification-daemon (pkg notification-daemon not marked upgrade)
WARNING:root:can't add notify-osd (pkg notify-osd not marked upgrade)

and I haven't found their source.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-06 14:54:54 +0000
3+++ debian/changelog 2012-12-13 13:58:19 +0000
4@@ -1,3 +1,12 @@
5+apt-clone (0.3.1~ubuntu2) raring; urgency=low
6+
7+ * Added XS-Testsuite header
8+ * Fixed ownership of testsuite data files
9+ * Redirected test stderr to stdout. python unittest output goes to stderr
10+ which adt-run considers as a failure.
11+
12+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Thu, 13 Dec 2012 14:31:13 +0100
13+
14 apt-clone (0.3.1~ubuntu1) raring; urgency=low
15
16 * Make sure #!/usr/bin/python3 is used, since dh_python3 stopped
17
18=== modified file 'debian/control'
19--- debian/control 2012-06-12 17:28:21 +0000
20+++ debian/control 2012-12-13 13:58:19 +0000
21@@ -11,6 +11,7 @@
22 Vcs-Bzr: http://bzr.debian.org/collab-maint/apt-clone/sid/
23 Vcs-Browser: http://bzr.debian.org/loggerhead/collab-maint/apt-clone/sid/
24 Homepage: https://launchpad.net/apt-clone
25+XS-Testsuite: autopkgtest
26
27 Package: apt-clone
28 Architecture: all
29
30=== modified file 'tests/Makefile'
31--- tests/Makefile 2012-11-01 10:18:59 +0000
32+++ tests/Makefile 2012-12-13 13:58:19 +0000
33@@ -2,10 +2,11 @@
34 all: test
35
36 test:
37+ sudo chown -R $$USER:$$USER .
38 pyflakes ../apt-clone ../apt_clone.py
39 set -e; for f in *.py; do \
40 for ver in python3 python; do \
41- PYTHONPATH=.. $$ver $$f -v ; \
42+ PYTHONPATH=.. $$ver $$f -v 2>&1; \
43 done; \
44 done; \
45 # cruft from the tests

Subscribers

People subscribed via source and target branches