merge

8 files changed, 27 insertions, 3 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bb6d0f8..2115bdc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,8 @@
 -----------------
 
 - require virtualenv-1.5.1 as to make pypy-1.4 work
+- fix issue14: report errors related to test command
+- fix issue20: document format of URLs for specifying dependencies
 
 0.9
 -----------------
diff --git a/doc/config.txt b/doc/config.txt
index 10d1da5..4fdbb7f 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -110,6 +110,15 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
         deps = :myindex:pkg
 
+    If you want to use URLs to install development versions
+    of a Python package you can use the ``+`` forms, for example::
+
+        svn+http://code.djangoproject.com/svn/django/trunk/
+        git+git://github.com/django/django.git
+
+    (You cannot use the ``#`` character because that would 
+    be regarded as a comment in the configuration file.)
+
 
 .. confval:: recreate=True|False(default)
 
diff --git a/doc/example/basic.txt b/doc/example/basic.txt
index 3ceeb87..9bf0b68 100644
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -103,3 +103,4 @@ To for tox to recreate a (particular) virtual environment::
 
 would trigger a complete reinstallation of the existing py27 environment
 (or create it afresh if it doesn't exist).
+
diff --git a/setup.py b/setup.py
index 349a8a9..a66916f 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://codespeak.net/tox',
-        version='0.9.1.dev1',
+        version='0.9.1.dev2',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tests/test_venv.py b/tests/test_venv.py
index 145a901..a05a5f3 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -199,6 +199,17 @@ def test_install_recreate(newmocksession):
     mocksession.report.expect("action", "*creating virtualenv*")
     venv.update()
     mocksession.report.expect("action", "recreating virtualenv*")
+
+def test_install_error(newmocksession):
+    mocksession = newmocksession(['--recreate'], """
+        [testenv]
+        deps=xyz
+        commands=
+            qwelkqw
+    """)
+    venv = mocksession.getenv('python')
+    venv.test()
+    mocksession.report.expect("error", "*not find*qwelkqw*")
  
 def test_install_python3(tmpdir, newmocksession):
     if not py.path.local.sysfind('python3.1'):
diff --git a/tox/__init__.py b/tox/__init__.py
index ce9dfc3..c29b430 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '0.9.1.dev1'
+__version__ = '0.9.1.dev2'
 
 from py.apipkg import initpkg
 
diff --git a/tox/_venv.py b/tox/_venv.py
index f5bb3a3..b2677f4 100644
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -241,6 +241,7 @@ class VirtualEnv(object):
             try:
                 self._pcall(argv, log=-1, cwd=cwd)
             except tox.exception.InvocationError:
+                self.session.report.error(str(sys.exc_info()[1]))
                 return True
 
     def _pcall(self, args, venv=True, log=None, cwd=None):
diff --git a/toxbootstrap.py b/toxbootstrap.py
index be25ceb..e10add4 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@ ToDo
 
 """
 
-__version__ = '0.9.1.dev1'
+__version__ = '0.9.1.dev2'
 
 import sys
 import os