Merge lp:~mitya57/ubuntu/vivid/pygments/fix-autopkgtests into lp:ubuntu/vivid-proposed/pygments

[Dmitry Shachnev]

Fixed the autopkgtests so that the package can migrate to -release.

Committed to Debian Svn, but did not upload because of freeze.

[Martin Pitt (pitti)]

Many thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-19 23:00:26 +0000
+++ debian/changelog	2014-11-06 12:37:53 +0000
@@ -1,3 +1,10 @@
+pygments (2.0~rc1.a2bc2bd+dfsg-1svn1) vivid; urgency=medium
+
+  * Drop disable_example_files_test.patch, no longer needed.
+  * Enable verbose tests output.
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 06 Nov 2014 14:49:27 +0300
+
 pygments (2.0~rc1.a2bc2bd+dfsg-1) unstable; urgency=medium
 
   [ Jakub Wilk ]

=== removed file 'debian/patches/disable_example_files_test.patch'
--- debian/patches/disable_example_files_test.patch	2013-01-06 14:38:26 +0000
+++ debian/patches/disable_example_files_test.patch	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-=== modified file 'tests/test_examplefiles.py'
---- a/tests/test_examplefiles.py	2012-03-11 18:22:42 +0000
-+++ b/tests/test_examplefiles.py	2012-11-12 07:18:38 +0000
-@@ -8,6 +8,7 @@
- """
- 
- import os
-+import nose
- import pprint
- import difflib
- import cPickle as pickle
-@@ -19,6 +20,7 @@
- STORE_OUTPUT = False
- 
- # generate methods
[e-mail]
- def test_example_files():
-     testdir = os.path.dirname(__file__)
-     outdir = os.path.join(testdir, 'examplefiles', 'output')
-

=== modified file 'debian/tests/control'
--- debian/tests/control	2014-10-19 23:00:26 +0000
+++ debian/tests/control	2014-11-06 12:37:53 +0000
@@ -1,5 +1,5 @@
 Tests: python-pygments
-Depends: patch, python-all, python-pygments, python-nose
+Depends: python-all, python-pygments, python-nose
 
 Tests: python3-pygments
-Depends: patch, python3-all, python3-pygments, python3-nose
+Depends: python3-all, python3-pygments, python3-nose

=== modified file 'debian/tests/python-pygments'
--- debian/tests/python-pygments	2013-01-06 14:38:26 +0000
+++ debian/tests/python-pygments	2014-11-06 12:37:53 +0000
@@ -3,9 +3,8 @@
 set -eu
 
 cp -r tests "$ADTTMP"
-cat debian/patches/disable_example_files_test.patch | (cd "$ADTTMP/tests" && patch -p2)
 cd "$ADTTMP/tests"
 
 for python in $(pyversions -i); do
-	PYTHONWARNINGS=d $python ./run.py 2>&1
+	PYTHONWARNINGS=d $python ./run.py --verbose 2>&1
 done

=== modified file 'debian/tests/python3-pygments'
--- debian/tests/python3-pygments	2013-01-06 14:38:26 +0000
+++ debian/tests/python3-pygments	2014-11-06 12:37:53 +0000
@@ -3,9 +3,8 @@
 set -eu
 
 cp -r tests "$ADTTMP"
-cat debian/patches/disable_example_files_test.patch | (cd "$ADTTMP/tests" && patch -p2)
 cd "$ADTTMP/tests"
 
 for python in $(py3versions -i); do
-	PYTHONWARNINGS=d $python ./run.py 2>&1
+	PYTHONWARNINGS=d $python ./run.py --verbose 2>&1
 done