[Python-modules-commits] [tox] 58/69: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository tox.

commit 6669c9f89cf5e2f7691af42cb7589510348b1a54
Merge: cb89fe0 9f9790d
Author: Barry Warsaw <barry at python.org>
Date:   Fri Sep 5 18:46:57 2014 -0400

    merge patched into master

 debian/.git-dpm                             |  4 ++--
 debian/patches/0005-Another-test-skip.patch | 21 +++++++++++++++++++++
 debian/patches/series                       |  1 +
 tests/test_venv.py                          |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index a46ada8,0000000..27bd9d7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 7d3c805c634a311b3f04b96dabc79fbdfad7e650
- 7d3c805c634a311b3f04b96dabc79fbdfad7e650
++9f9790d50e508013b5632ae94930869e5edd215e
++9f9790d50e508013b5632ae94930869e5edd215e
 +3a2a218f1d633f16ab8874da292a70aaa8ff6d28
 +3a2a218f1d633f16ab8874da292a70aaa8ff6d28
 +tox_1.7.2.orig.tar.gz
 +b8a0a36ad3e0169058d36c9df670f43332f2a72c
 +84875
diff --cc debian/patches/0005-Another-test-skip.patch
index 0000000,0000000..c1853ec
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Another-test-skip.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 9f9790d50e508013b5632ae94930869e5edd215e Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 5 Sep 2014 18:46:44 -0400
++Subject: Another test skip.
++
++---
++ tests/test_venv.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tests/test_venv.py b/tests/test_venv.py
++index 6482e09..cde9b16 100644
++--- a/tests/test_venv.py
+++++ b/tests/test_venv.py
++@@ -268,6 +268,7 @@ def test_install_error(newmocksession, monkeypatch):
++     mocksession.report.expect("error", "*not find*qwelkqw*")
++     assert venv.status == "commands failed"
++ 
+++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
++ def test_install_command_not_installed(newmocksession, monkeypatch):
++     mocksession = newmocksession(['--recreate'], """
++         [testenv]
diff --cc debian/patches/series
index fa8b593,0000000..d0c47a5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +intersphinx-mapping.patch
 +hack-requires.patch
 +build-time-tests.patch
 +de-google-ify.patch
++0005-Another-test-skip.patch

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