[Python-modules-commits] [python-pex] 01/01: * d/tests: - Rewrite the execution test so that it's compatible between both Ubuntu and Debian, negating the need for an Ubuntu delta. The extra required package is now conditionally installed depending on the dpkg-vendor. Also, by setting http_proxy and https_proxy to the discard port, we ensure that pex cannot install from PyPI (it must use system packages to resolve dependencies in the test). - d/t/execute.sh: Added. - d/t/control: Call execute.sh instead of using a Test-Command, and add the needs-root Restriction (for the conditional `apt-get install` in the script).

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-pex.

commit 1fae163697ae405d7edfb36eaeadfd3ef9d20a36
Author: Barry Warsaw <barry at debian.org>
Date:   Thu Oct 15 10:48:46 2015 -0400

    * d/tests:
      - Rewrite the execution test so that it's compatible between both
        Ubuntu and Debian, negating the need for an Ubuntu delta.  The extra
        required package is now conditionally installed depending on the
        dpkg-vendor.  Also, by setting http_proxy and https_proxy to the
        discard port, we ensure that pex cannot install from PyPI (it must
        use system packages to resolve dependencies in the test).
      - d/t/execute.sh: Added.
      - d/t/control: Call execute.sh instead of using a Test-Command, and
        add the needs-root Restriction (for the conditional `apt-get
        install` in the script).
---
 debian/changelog        | 11 +++++++++++
 debian/tests/control    |  6 +++---
 debian/tests/execute.sh | 12 ++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b67bef..833e20f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,17 @@ python-pex (1.1.0-2) UNRELEASED; urgency=medium
   * d/rules:
     - Added override_dh_installdocs to build the Sphinx documentation.
     - Added override_dh_auto_clean to remove the doc build directory.
+  * d/tests:
+    - Rewrite the execution test so that it's compatible between both
+      Ubuntu and Debian, negating the need for an Ubuntu delta.  The extra
+      required package is now conditionally installed depending on the
+      dpkg-vendor.  Also, by setting http_proxy and https_proxy to the
+      discard port, we ensure that pex cannot install from PyPI (it must
+      use system packages to resolve dependencies in the test).
+    - d/t/execute.sh: Added.
+    - d/t/control: Call execute.sh instead of using a Test-Command, and
+      add the needs-root Restriction (for the conditional `apt-get
+      install` in the script).
 
  -- Barry Warsaw <barry at debian.org>  Tue, 13 Oct 2015 10:42:18 -0400
 
diff --git a/debian/tests/control b/debian/tests/control
index 728fa05..cd885af 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-Test-Command: pex -m textwrap -vv -o script && ./script
-Restrictions: allow-stderr
-Depends: @
+Tests: execute.sh
+Restrictions: allow-stderr, needs-root
+Depends: @, dpkg-dev
 
 Test-Command: python -c "import pex; print pex"
 Depends: @
diff --git a/debian/tests/execute.sh b/debian/tests/execute.sh
new file mode 100644
index 0000000..f1cec69
--- /dev/null
+++ b/debian/tests/execute.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+# On Ubuntu, we need an extra dependency because of LP: #1485093
+dpkg-vendor --is ubuntu && apt-get install -y ubuntu-drivers-common || true
+
+# Now ensure that pex can't download anything from PyPI.
+export http_proxy=127.0.0.1:9
+export https_proxy=127.0.0.1:9
+
+pex -m textwrap -vv -o script && ./script

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pex.git