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

[Jean-Baptiste Lallement]

[Martin Pitt (pitti)]

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]

19. By Jean-Baptiste Lallement on 2012-12-13

Added comment about test redirection

[Jean-Baptiste Lallement (jibel)]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 14:54:54 +0000
+++ debian/changelog	2012-12-13 13:58:19 +0000
@@ -1,3 +1,12 @@
+apt-clone (0.3.1~ubuntu2) raring; urgency=low
+
+  * Added XS-Testsuite header
+  * Fixed ownership of testsuite data files
+  * Redirected test stderr to stdout. python unittest output goes to stderr
+    which adt-run considers as a failure. 
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Thu, 13 Dec 2012 14:31:13 +0100
+
 apt-clone (0.3.1~ubuntu1) raring; urgency=low
 
   * Make sure #!/usr/bin/python3 is used, since dh_python3 stopped

=== modified file 'debian/control'
--- debian/control	2012-06-12 17:28:21 +0000
+++ debian/control	2012-12-13 13:58:19 +0000
@@ -11,6 +11,7 @@
 Vcs-Bzr: http://bzr.debian.org/collab-maint/apt-clone/sid/
 Vcs-Browser: http://bzr.debian.org/loggerhead/collab-maint/apt-clone/sid/
 Homepage: https://launchpad.net/apt-clone
+XS-Testsuite: autopkgtest
 
 Package: apt-clone
 Architecture: all

=== modified file 'tests/Makefile'
--- tests/Makefile	2012-11-01 10:18:59 +0000
+++ tests/Makefile	2012-12-13 13:58:19 +0000
@@ -2,10 +2,11 @@
 all: test
 
 test:
+	sudo chown -R $$USER:$$USER .
 	pyflakes ../apt-clone ../apt_clone.py
 	set -e; for f in *.py; do \
 		for ver in python3 python; do \
-			PYTHONPATH=.. $$ver $$f -v ; \
+			PYTHONPATH=.. $$ver $$f -v 2>&1; \
 		done; \
 	done; \
 	# cruft from the tests