[Python-modules-commits] r17746 - in packages/sphinx/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, July 7, 2011 @ 18:13:46
  Author: jwilk
Revision: 17746

Fix test_build_latex to not fail in a directory with special characters.

Added:
  packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-07-07 17:48:21 UTC (rev 17745)
+++ packages/sphinx/trunk/debian/changelog	2011-07-07 18:13:46 UTC (rev 17746)
@@ -19,8 +19,9 @@
     documentation in Debian packages.
     + Update debian/rules, debian/control and debian/*.links to use
       dh_sphinxdoc.
+  * Fix test_build_latex to not fail in a directory with special characters.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 07 Jul 2011 18:11:57 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 07 Jul 2011 20:12:59 +0200
 
 sphinx (1.0.7-5) unstable; urgency=low
 

Added: packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff	2011-07-07 18:13:46 UTC (rev 17746)
@@ -0,0 +1,16 @@
+Description: Fix test_build_latex to not fail in a directory with special characters.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+Last-Update: 2011-07-07
+
+--- a/tests/test_build_latex.py
++++ b/tests/test_build_latex.py
+@@ -38,7 +38,7 @@
+     LaTeXTranslator.ignore_missing_images = True
+     app.builder.build_all()
+     latex_warnings = latex_warnfile.getvalue().replace(os.sep, '/')
+-    latex_warnings_exp = LATEX_WARNINGS % {'root': app.srcdir}
++    latex_warnings_exp = LATEX_WARNINGS % {'root': re.escape(app.srcdir)}
+     assert re.match(latex_warnings_exp + '$', latex_warnings), \
+            'Warnings don\'t match:\n' + \
+            '--- Expected (regex):\n' + latex_warnings_exp + \

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2011-07-07 17:48:21 UTC (rev 17745)
+++ packages/sphinx/trunk/debian/patches/series	2011-07-07 18:13:46 UTC (rev 17746)
@@ -4,3 +4,4 @@
 show_more_stack_frames.diff
 fix_jquery_1.5_incompatibility.diff
 docstring_parse.diff
+fix_test_build_latex.diff

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2011-07-07 17:48:21 UTC (rev 17745)
+++ packages/sphinx/trunk/debian/rules	2011-07-07 18:13:46 UTC (rev 17746)
@@ -22,10 +22,10 @@
 	mkdir -p build/html
 	PYTHONPATH=. python debian/sphinx-build-local.py doc build/html
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	#set -e -x; \
-	#for python in $(shell pyversions -r); do \
-	#	$$python tests/run.py; \
-	#done
+	set -e -x; \
+	for python in $(shell pyversions -r); do \
+		$$python tests/run.py; \
+	done
 	xvfb-run ./debian/jstest/run-tests
 endif
 	touch build-stamp