[Python-modules-commits] [python-docker] 01/02: autopkgtest: fix running of integration test

Ondřej Nový onovy at moszumanska.debian.org
Fri Oct 7 20:55:09 UTC 2016


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

onovy pushed a commit to branch master
in repository python-docker.

commit 5e628df68bf26dd868834d4842a646ed16ca5c1d
Author: Ondřej Nový <onovy at debian.org>
Date:   Fri Oct 7 22:52:40 2016 +0200

    autopkgtest: fix running of integration test
---
 debian/changelog         | 4 ++++
 debian/tests/control     | 2 +-
 debian/tests/integration | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f546ec3..c283ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-docker (1.9.0-1) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * New upstream release (Closes: #830172)
   * Dropped
     d/p/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
@@ -7,6 +8,9 @@ python-docker (1.9.0-1) UNRELEASED; urgency=medium
   * Bump required version of python3-websocket to 0.32.0
   * Standards-Version is 3.9.8 now (no change)
 
+  [ Andreas Henriksson ]
+  * autopkgtest: fix running of integration test
+
  -- Ondřej Nový <onovy at debian.org>  Thu, 08 Sep 2016 14:30:01 +0200
 
 python-docker (1.7.2-1) unstable; urgency=medium
diff --git a/debian/tests/control b/debian/tests/control
index 7a0072b..3b02db1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: integration
-Depends: docker.io, python-mock, python-pytest, python3-mock, python3-pytest, @
+Depends: docker.io, python-mock, python-pytest, python3-mock, python3-pytest, python-backports.ssl-match-hostname, @
 Restrictions: isolation-machine needs-root
diff --git a/debian/tests/integration b/debian/tests/integration
index 120a2aa..156b4e7 100755
--- a/debian/tests/integration
+++ b/debian/tests/integration
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-py.test-3 tests/integration_test.py
-py.test tests/integration_test.py
+py.test-3 tests/integration/
+py.test tests/integration/

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



More information about the Python-modules-commits mailing list