From e58b44a029f11dc6d593e24dd7511c767a79df0a6cd05ad7660ecec80472633b Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 6 Apr 2016 20:19:33 +0000 Subject: [PATCH 1/2] Accepting request 385464 from home:frispete:python - remove failing test: test_force_dep_with_url OBS-URL: https://build.opensuse.org/request/show/385464 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=27 --- python-tox.changes | 5 +++++ tox-disable-env-tests.patch | 41 ++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/python-tox.changes b/python-tox.changes index fc3004e..2d428e5 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 6 19:49:22 UTC 2016 - hpj@urpla.net + +- remove failing test: test_force_dep_with_url + ------------------------------------------------------------------- Mon Feb 8 16:58:52 UTC 2016 - tbechtold@suse.com diff --git a/tox-disable-env-tests.patch b/tox-disable-env-tests.patch index b7ace08..138da74 100644 --- a/tox-disable-env-tests.patch +++ b/tox-disable-env-tests.patch @@ -1,8 +1,35 @@ -Index: tox-2.3.1/tests/test_config.py +Index: b/tests/test_config.py =================================================================== ---- tox-2.3.1.orig/tests/test_config.py -+++ tox-2.3.1/tests/test_config.py -@@ -1784,84 +1784,6 @@ class TestParseEnv: +--- a/tests/test_config.py ++++ b/tests/test_config.py +@@ -88,26 +88,6 @@ class TestVenvConfig: + 'dep1==1.5', 'dep2==2.1', 'dep3==3.0', 'dep4==4.0', + ] + +- def test_force_dep_with_url(self, initproj): +- initproj("example123-0.5", filedefs={ +- 'tox.ini': ''' +- [tox] +- +- [testenv] +- deps= +- dep1==1.0 +- https://pypi.python.org/xyz/pkg1.tar.gz +- ''' +- }) +- config = parseconfig( +- ['--force-dep=dep1==1.5']) +- assert config.option.force_dep == [ +- 'dep1==1.5' +- ] +- assert [str(x) for x in config.envconfigs['python'].deps] == [ +- 'dep1==1.5', 'https://pypi.python.org/xyz/pkg1.tar.gz' +- ] +- + def test_is_same_dep(self): + """ + Ensure correct parseini._is_same_dep is working with a few samples. +@@ -1784,84 +1764,6 @@ class TestParseEnv: assert config.envconfigs['hello'].recreate @@ -87,10 +114,10 @@ Index: tox-2.3.1/tests/test_config.py @pytest.mark.parametrize("cmdline,envlist", [ ("-e py26", ['py26']), ("-e py26,py33", ['py26', 'py33']), -Index: tox-2.3.1/tests/test_z_cmdline.py +Index: b/tests/test_z_cmdline.py =================================================================== ---- tox-2.3.1.orig/tests/test_z_cmdline.py -+++ tox-2.3.1/tests/test_z_cmdline.py +--- a/tests/test_z_cmdline.py ++++ b/tests/test_z_cmdline.py @@ -1,760 +0,0 @@ -import tox -import py From 554e7117697377f30445db9bde9184d9ab23937839b662b89658fbcb649b2eab Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 6 Apr 2016 20:20:03 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=28 --- python-tox.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-tox.changes b/python-tox.changes index 2d428e5..66dd655 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Apr 6 19:49:22 UTC 2016 - hpj@urpla.net -- remove failing test: test_force_dep_with_url +- remove failing test: test_force_dep_with_url; requires network + update tox-disable-env-tests.patch ------------------------------------------------------------------- Mon Feb 8 16:58:52 UTC 2016 - tbechtold@suse.com