r2797 - in zope.testing/trunk/debian (6 files)

[barry at users.alioth.debian.org]

    Date: Sunday, June 22, 2014 @ 21:34:51
  Author: barry
Revision: 2797

* d/tests/all{,-3}: Updated.
* d/python-zope.testing.install: Removed; unneccesary.
* d/test_helper: Removed; unnecessary.

Modified:
  zope.testing/trunk/debian/changelog
  zope.testing/trunk/debian/tests/all
  zope.testing/trunk/debian/tests/all-3
Deleted:
  zope.testing/trunk/debian/python-zope.testing.install
  zope.testing/trunk/debian/python3-zope.testing.install
  zope.testing/trunk/debian/test_helper

Modified: zope.testing/trunk/debian/changelog
===================================================================
--- zope.testing/trunk/debian/changelog	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/changelog	2014-06-22 21:34:51 UTC (rev 2797)
@@ -29,8 +29,9 @@
   * d/rules: 
     - Converted to --buildsystem=pybuild and simplify.
     - Fix override_dh_installchangelogs rule.
-  * d/python3-zope.testing.install: Added
-  * d/tests/all-3: Fix path to test_helper.
+  * d/tests/all{,-3}: Updated.
+  * d/python-zope.testing.install: Removed; unneccesary.
+  * d/test_helper: Removed; unnecessary.
 
  -- Barry Warsaw <barry at debian.org>  Sun, 22 Jun 2014 16:32:04 -0400
 

Deleted: zope.testing/trunk/debian/python-zope.testing.install
===================================================================
--- zope.testing/trunk/debian/python-zope.testing.install	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/python-zope.testing.install	2014-06-22 21:34:51 UTC (rev 2797)
@@ -1 +0,0 @@
-debian/test_helper usr/share/python-zope.testing

Deleted: zope.testing/trunk/debian/python3-zope.testing.install
===================================================================
--- zope.testing/trunk/debian/python3-zope.testing.install	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/python3-zope.testing.install	2014-06-22 21:34:51 UTC (rev 2797)
@@ -1 +0,0 @@
-debian/test_helper usr/share/python3-zope.testing

Deleted: zope.testing/trunk/debian/test_helper
===================================================================
--- zope.testing/trunk/debian/test_helper	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/test_helper	2014-06-22 21:34:51 UTC (rev 2797)
@@ -1,27 +0,0 @@
-# includable shell script to make test scripts smaller
-
-set -e
-
-echo "This script is deprecated, please use the corresponding script in the python-zope.testrunner package."
-
-if [ ! -x /usr/bin/zope-testrunner ]; then
-    echo "Could not find /usr/bin/zope-testrunner, please install python-zope.testrunner."
-    exit 1
-fi
-
-if [ -z "${testfilter}" ]; then
-   if [ -x /usr/bin/van-pydeb ]; then
-       testfilter="-m $(van-pydeb src_to_py $(grep 'Source: ' debian/control | sed 's/Source: //'))"
-   else
-       echo "Could not find van-pydeb to guess the python package name. You should have your tests depend on it or you "
-       echo "must specify testfilter variable, something like -s package_name, see zope-testrunner --help for details."
-       exit 1
-   fi
-fi 
-   
-PYVERS=$(pyversions -r debian/control)
-for python in ${PYVERS}; do
-    py_libdir_sh=$(${python} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-    echo Running tests for ${python}: /usr/bin/zope-testrunner -k --test-path ${py_libdir_sh} ${testfilter}
-    ${python} /usr/bin/zope-testrunner -k --test-path ${py_libdir_sh} ${testfilter}
-done

Modified: zope.testing/trunk/debian/tests/all
===================================================================
--- zope.testing/trunk/debian/tests/all	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/tests/all	2014-06-22 21:34:51 UTC (rev 2797)
@@ -1,3 +1,3 @@
 #!/bin/bash
-testfilter="-s zope.testing"
-. /usr/share/python-zope.testrunner/test_helper
+lib=`python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'`
+/usr/bin/zope-testrunner -k --test-path ${lib} -s zope.testing

Modified: zope.testing/trunk/debian/tests/all-3
===================================================================
--- zope.testing/trunk/debian/tests/all-3	2014-06-22 20:49:32 UTC (rev 2796)
+++ zope.testing/trunk/debian/tests/all-3	2014-06-22 21:34:51 UTC (rev 2797)
@@ -1,3 +1,3 @@
 #!/bin/bash
-testfilter="-s zope.testing"
-. /usr/share/python3-zope.testrunner/test_helper
+lib=`python3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'`
+/usr/bin/zope-testrunner3 -k --test-path ${lib} -s zope.testing