diff options
author | holger krekel <holger@merlinux.eu> | 2013-12-09 16:28:27 +0100 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2013-12-09 16:28:27 +0100 |
commit | 20f704b92bd964ec88b0a4eefe920a30c360452e (patch) | |
tree | 745fae64fb7fd5d034c59f13ff391105cb21a20e | |
parent | 910045779225c9891fadff7c1a18572a02df20ae (diff) | |
download | tox-20f704b92bd964ec88b0a4eefe920a30c360452e.tar.gz |
fix issue105 -- don't depend on an existing HOME directory from tox tests.
-rwxr-xr-x | CHANGELOG | 2 | ||||
-rw-r--r-- | tests/test_venv.py | 2 | ||||
-rw-r--r-- | tox/_cmdline.py | 9 |
3 files changed, 11 insertions, 2 deletions
@@ -50,6 +50,8 @@ - introduce --sitepackages to force sitepackages=True in all environments. +- fix issue105 -- don't depend on an existing HOME directory from tox tests. + 1.6.1 ----- diff --git a/tests/test_venv.py b/tests/test_venv.py index e4d0b29..0ac8f90 100644 --- a/tests/test_venv.py +++ b/tests/test_venv.py @@ -117,6 +117,8 @@ def test_create_sitepackages(monkeypatch, mocksession, newconfig): def test_install_deps_wildcard(newmocksession): mocksession = newmocksession([], """ + [tox] + distshare = {toxworkdir}/distshare [testenv:py123] deps= {distshare}/dep1-* diff --git a/tox/_cmdline.py b/tox/_cmdline.py index a42eb79..7c6cd69 100644 --- a/tox/_cmdline.py +++ b/tox/_cmdline.py @@ -417,8 +417,13 @@ class Session: if sdistfile != sdist_path: self.report.info("copying new sdistfile to %r" % str(sdistfile)) - sdistfile.dirpath().ensure(dir=1) - sdist_path.copy(sdistfile) + try: + sdistfile.dirpath().ensure(dir=1) + except py.error.Error: + self.report.warning("could not copy distfile to %s" % + sdistfile.dirpath()) + else: + sdist_path.copy(sdistfile) return sdist_path def subcommand_test(self): |