[Python-modules-commits] r21993 - in packages/python-mock/trunk/debian (5 files)

[fladi-guest at users.alioth.debian.org]

    Date: Thursday, May 31, 2012 @ 07:45:06
  Author: fladi-guest
Revision: 21993

Run tests during build (Closes: #667554).

Added:
  packages/python-mock/trunk/debian/patches/
  packages/python-mock/trunk/debian/patches/python3.2_tests.patch
  packages/python-mock/trunk/debian/patches/series
Modified:
  packages/python-mock/trunk/debian/control
  packages/python-mock/trunk/debian/rules

Modified: packages/python-mock/trunk/debian/control
===================================================================
--- packages/python-mock/trunk/debian/control	2012-05-31 07:29:44 UTC (rev 21992)
+++ packages/python-mock/trunk/debian/control	2012-05-31 07:45:06 UTC (rev 21993)
@@ -7,6 +7,7 @@
 Build-Depends: debhelper (>= 8),
                python-all (>= 2.6.6-3~),
                python-setuptools,
+               python-unittest2,
                python3-all (>= 3.1.2-12~),
                python3-setuptools
 Build-Depends-Indep: libjs-jquery, python-sphinx (>= 1.0.7+dfsg-1~)

Added: packages/python-mock/trunk/debian/patches/python3.2_tests.patch
===================================================================
--- packages/python-mock/trunk/debian/patches/python3.2_tests.patch	                        (rev 0)
+++ packages/python-mock/trunk/debian/patches/python3.2_tests.patch	2012-05-31 07:45:06 UTC (rev 21993)
@@ -0,0 +1,39 @@
+Description: Allow tests to be run with python3 (>= 3.2).
+ Make use of 2to3 in order to run test directly through 
+ setup.py with both python2 and python3.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2012-05-30
+Forwarded: no
+
+--- a/setup.py
++++ b/setup.py
+@@ -7,7 +7,7 @@
+ from mock import __version__
+ 
+ import os
+-
++import sys
+ 
+ NAME = 'mock'
+ MODULES = ['mock']
+@@ -50,6 +50,7 @@
+     name=NAME,
+     version=__version__,
+     py_modules=MODULES,
++    use_2to3=True,
+ 
+     # metadata for upload to PyPI
+     author=AUTHOR,
+@@ -66,7 +67,10 @@
+ except ImportError:
+     from distutils.core import setup
+ else:
+-    params['tests_require'] = ['unittest2']
+-    params['test_suite'] = 'unittest2.collector'
++    if sys.version_info >= (3,):
++        params['test_suite'] = 'tests'
++    else:
++        params['tests_require'] = ['unittest2']
++        params['test_suite'] = 'unittest2.collector'
+ 
+ setup(**params)

Added: packages/python-mock/trunk/debian/patches/series
===================================================================
--- packages/python-mock/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-mock/trunk/debian/patches/series	2012-05-31 07:45:06 UTC (rev 21993)
@@ -0,0 +1 @@
+python3.2_tests.patch

Modified: packages/python-mock/trunk/debian/rules
===================================================================
--- packages/python-mock/trunk/debian/rules	2012-05-31 07:29:44 UTC (rev 21992)
+++ packages/python-mock/trunk/debian/rules	2012-05-31 07:45:06 UTC (rev 21993)
@@ -51,3 +51,12 @@
 	rm -rf docs/.build
 	dh_clean
 
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py setup.py test ; \
+	done
+endif
+