[Python-modules-commits] r23181 - in packages/sphinx/trunk/debian (5 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, December 18, 2012 @ 22:16:15
  Author: jwilk
Revision: 23181

Add DEP-8 tests for the documentation package.

Added:
  packages/sphinx/trunk/debian/tests/sphinx-doc
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/jstest/run-tests
  packages/sphinx/trunk/debian/rules
  packages/sphinx/trunk/debian/tests/control

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-12-18 21:41:52 UTC (rev 23180)
+++ packages/sphinx/trunk/debian/changelog	2012-12-18 22:16:15 UTC (rev 23181)
@@ -2,8 +2,9 @@
 
   * Backport upstream patch for fix compatibility with Docutils 0.10.
   * Run 2to3 in parallel.
+  * Add DEP-8 tests for the documentation package.
 
- -- Jakub Wilk <jwilk at debian.org>  Tue, 18 Dec 2012 22:41:17 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 18 Dec 2012 23:06:29 +0100
 
 sphinx (1.1.3+dfsg-6) experimental; urgency=low
 

Modified: packages/sphinx/trunk/debian/jstest/run-tests
===================================================================
--- packages/sphinx/trunk/debian/jstest/run-tests	2012-12-18 21:41:52 UTC (rev 23180)
+++ packages/sphinx/trunk/debian/jstest/run-tests	2012-12-18 22:16:15 UTC (rev 23181)
@@ -26,7 +26,7 @@
 if __name__ == '__main__':
     if not os.getenv('DISPLAY'):
         raise RuntimeError('These tests requires access to an X server')
-    build_directory = os.path.join(os.path.dirname(__file__), '..', '..', 'build', 'html')
+    [build_directory] = sys.argv[1:]
     build_directory = os.path.abspath(build_directory)
     n_failures = 0
     for testcase in t1, t2, t3:

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2012-12-18 21:41:52 UTC (rev 23180)
+++ packages/sphinx/trunk/debian/rules	2012-12-18 22:16:15 UTC (rev 23181)
@@ -46,7 +46,7 @@
 	$(python_all) tests/run.py --verbose --no-skip
 	$(python3_all) tests/run.py --verbose
 	cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle
-	xvfb-run -a ./debian/jstest/run-tests
+	xvfb-run -a ./debian/jstest/run-tests build/html/
 endif
 	touch build-stamp
 

Modified: packages/sphinx/trunk/debian/tests/control
===================================================================
--- packages/sphinx/trunk/debian/tests/control	2012-12-18 21:41:52 UTC (rev 23180)
+++ packages/sphinx/trunk/debian/tests/control	2012-12-18 22:16:15 UTC (rev 23181)
@@ -3,3 +3,6 @@
 
 Tests: python3-sphinx
 Depends: python3-sphinx, python3-nose
+
+Tests: sphinx-doc
+Depends: sphinx-doc, python, python-webkit, xvfb

Added: packages/sphinx/trunk/debian/tests/sphinx-doc
===================================================================
--- packages/sphinx/trunk/debian/tests/sphinx-doc	                        (rev 0)
+++ packages/sphinx/trunk/debian/tests/sphinx-doc	2012-12-18 22:16:15 UTC (rev 23181)
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e -u
+cp -r debian/jstest "$ADTTMP/"
+cd "$ADTTMP"
+for python in python python3
+do
+    for format in rst html
+    do
+        [ "$(readlink -f /usr/share/doc/$python-sphinx/$format)" = "$(readlink -f /usr/share/doc/sphinx-doc/$format)" ]
+    done
+done
+run_js_tests='jstest/run-tests /usr/share/doc/sphinx-doc/html/'
+if [ -n "${DISPLAY:-}" ]
+then
+    $run_js_tests
+else
+    xvfb-run -a $run_js_tests
+fi
+
+# vim:ts=4 sw=4 et