This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw.
commit 24f8c8b19ea4157ffb96e97e444b965e07a5c31a Author: Bas Couwenberg <[email protected]> Date: Thu Jul 7 01:11:28 2016 +0200 Override dh_auto_test to use `paver test`. --- debian/changelog | 1 + debian/control | 11 +++++++++++ debian/patches/offline-tests.patch | 39 ++++++++++++++++++++++++++++++++++++++ debian/patches/pavement.patch | 19 +++++++++++++++++++ debian/patches/series | 2 ++ debian/rules | 5 +++++ 6 files changed, 77 insertions(+) diff --git a/debian/changelog b/debian/changelog index 987b187..59e1bb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ pycsw (2.0.0~rc1+dfsg-1) UNRELEASED; urgency=medium * Update WSGI script to install. * Add python-six & python-xmltodict to dependencies. * Update default.cfg for database rename. + * Override dh_auto_test to use `paver test`. -- Bas Couwenberg <[email protected]> Wed, 06 Jul 2016 17:46:22 +0200 diff --git a/debian/control b/debian/control index 0976223..da96d55 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,20 @@ Build-Depends: apache2-dev, dh-apache2, dh-exec, dh-python, + procps, python-setuptools, python-all, + python-geolinks, + python-lxml, + python-owslib, + python-paver, + python-pyproj, + python-shapely, + python-six, python-sphinx, + python-sqlalchemy, + python-tz, + python-xmltodict, ruby-ronn Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pycsw.git diff --git a/debian/patches/offline-tests.patch b/debian/patches/offline-tests.patch new file mode 100644 index 0000000..5dcb33f --- /dev/null +++ b/debian/patches/offline-tests.patch @@ -0,0 +1,39 @@ +Description: Disable GetRecords-distributedsearch test, requires network. +Author: Bas Couwenberg <[email protected]> + +--- /dev/null ++++ b/tests/suites/default/post/GetRecords-distributedsearch.disabled +@@ -0,0 +1,15 @@ ++<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> ++<csw:GetRecords xmlns:csw="http://www.opengis.net/cat/csw/2.0.2"; xmlns:ogc="http://www.opengis.net/ogc"; service="CSW" version="2.0.2" resultType="results" startPosition="1" maxRecords="5" outputFormat="application/xml" outputSchema="http://www.opengis.net/cat/csw/2.0.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd";> ++ <csw:DistributedSearch hopCount="2"/> ++ <csw:Query typeNames="csw:Record"> ++ <csw:ElementSetName>brief</csw:ElementSetName> ++ <csw:Constraint version="1.1.0"> ++ <ogc:Filter> ++ <ogc:PropertyIsEqualTo> ++ <ogc:PropertyName>dc:title</ogc:PropertyName> ++ <ogc:Literal>Aquifers</ogc:Literal> ++ </ogc:PropertyIsEqualTo> ++ </ogc:Filter> ++ </csw:Constraint> ++ </csw:Query> ++</csw:GetRecords> +--- a/tests/suites/default/post/GetRecords-distributedsearch.xml ++++ /dev/null +@@ -1,15 +0,0 @@ +-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> +-<csw:GetRecords xmlns:csw="http://www.opengis.net/cat/csw/2.0.2"; xmlns:ogc="http://www.opengis.net/ogc"; service="CSW" version="2.0.2" resultType="results" startPosition="1" maxRecords="5" outputFormat="application/xml" outputSchema="http://www.opengis.net/cat/csw/2.0.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd";> +- <csw:DistributedSearch hopCount="2"/> +- <csw:Query typeNames="csw:Record"> +- <csw:ElementSetName>brief</csw:ElementSetName> +- <csw:Constraint version="1.1.0"> +- <ogc:Filter> +- <ogc:PropertyIsEqualTo> +- <ogc:PropertyName>dc:title</ogc:PropertyName> +- <ogc:Literal>Aquifers</ogc:Literal> +- </ogc:PropertyIsEqualTo> +- </ogc:Filter> +- </csw:Constraint> +- </csw:Query> +-</csw:GetRecords> diff --git a/debian/patches/pavement.patch b/debian/patches/pavement.patch new file mode 100644 index 0000000..72fb1b7 --- /dev/null +++ b/debian/patches/pavement.patch @@ -0,0 +1,19 @@ +Description: Don't rely on pycsw-admin.py in $PATH for paver tests. +Author: Bas Couwenberg <[email protected]> + +--- a/pavement.py ++++ b/pavement.py +@@ -166,11 +166,11 @@ def setup_testdata(): + for database, has_testdata in test_database_parameters.items(): + info('Setting up test database %s' % database) + cfg = path('tests/suites/%s/default.cfg' % database) +- sh('pycsw-admin.py -c setup_db -f %s' % cfg) ++ sh('python bin/pycsw-admin.py -c setup_db -f %s' % cfg) + if has_testdata: + datapath = path('tests/suites/%s/data' % database) + info('Loading test data from %s' % datapath) +- sh('pycsw-admin.py -c load_records -f %s -p %s' % (cfg, datapath)) ++ sh('python bin/pycsw-admin.py -c load_records -f %s -p %s' % (cfg, datapath)) + + + @task diff --git a/debian/patches/series b/debian/patches/series index 609fe90..6c39d05 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ 0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch 0005-Set-default-configuration-path-for-wsgi.patch 0006-Don-t-include-external-references-to-images.patch +pavement.patch +offline-tests.patch diff --git a/debian/rules b/debian/rules index 1f711db..3892788 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,11 @@ override_dh_auto_build: PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html # HTML generator ronn debian/man/pycsw-admin.md +override_dh_auto_test: + PYBUILD_SYSTEM=custom \ + PYBUILD_TEST_ARGS="cd {dir} && PYTHONPATH={dir} paver test" \ + PYBUILD_AFTER_TEST="rm -rf {dir}/tests/results/" dh_auto_test + override_dh_install: dh_install --list-missing -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
