From 4a81aa47620a4fa242a13a0dd73141a2af6e2d3357f1204d04554d9bdffd2a69 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 19 Apr 2018 13:01:36 +0000 Subject: [PATCH 1/6] - only run generic tests using pytest (bsc#1089564) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=34 --- python-dogpile.cache.changes | 5 +++++ python-dogpile.cache.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes index c08a59d..acd028e 100644 --- a/python-dogpile.cache.changes +++ b/python-dogpile.cache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 19 13:00:53 UTC 2018 - dmueller@suse.com + +- only run generic tests using pytest (bsc#1089564) + ------------------------------------------------------------------- Tue Mar 27 00:44:45 CEST 2018 - ro@suse.de diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec index 01f3aa7..379e55c 100644 --- a/python-dogpile.cache.spec +++ b/python-dogpile.cache.spec @@ -66,7 +66,8 @@ new value. %python_expand %fdupes -s %{buildroot}/%{python_sitelib} %check -%python_exec setup.py test +export RUNTESTS="-k 'not test_dbm_backend and not test_memcached_backend and not test_redis_backend'" +%python_exec -m pytest %files %{python_files} %defattr(-,root,root,-) From ee20ab266a6197f61d5a5d4f36e6ccf6b42efe3fa78534713bad75f0f63c6f99 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 20 Apr 2018 07:51:14 +0000 Subject: [PATCH 2/6] - for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=35 --- python-dogpile.cache.changes | 5 +++++ python-dogpile.cache.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes index acd028e..6b15ab1 100644 --- a/python-dogpile.cache.changes +++ b/python-dogpile.cache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 20 07:50:52 UTC 2018 - dmueller@suse.com + +- for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch + ------------------------------------------------------------------- Thu Apr 19 13:00:53 UTC 2018 - dmueller@suse.com diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec index 379e55c..d80233a 100644 --- a/python-dogpile.cache.spec +++ b/python-dogpile.cache.spec @@ -26,7 +26,6 @@ License: BSD-3-Clause Group: Development/Languages/Python Url: http://bitbucket.org/zzzeek/dogpile.cache Source: https://pypi.io/packages/source/d/dogpile.cache/dogpile.cache-%{version}.tar.gz -Patch1: dogpile.cache-tests_more_slow_waiters.patch BuildRequires: %{python_module Mako} BuildRequires: %{python_module devel} BuildRequires: %{python_module mock} @@ -56,7 +55,6 @@ new value. %prep %setup -q -n dogpile.cache-%{version} -%patch1 -p1 %build %python_build From a1e7e01395c15a49a6806a6ae97b5b3874aa1725deddffb59ea53e1587dc5282 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Apr 2018 12:54:46 +0000 Subject: [PATCH 3/6] - skip lock tests, they fail frequently (bsc#1086987) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=36 --- python-dogpile.cache.changes | 5 +++++ python-dogpile.cache.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes index 6b15ab1..0c247dd 100644 --- a/python-dogpile.cache.changes +++ b/python-dogpile.cache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 12:54:25 UTC 2018 - dmueller@suse.com + +- skip lock tests, they fail frequently (bsc#1086987) + ------------------------------------------------------------------- Fri Apr 20 07:50:52 UTC 2018 - dmueller@suse.com diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec index d80233a..78e32bf 100644 --- a/python-dogpile.cache.spec +++ b/python-dogpile.cache.spec @@ -65,7 +65,7 @@ new value. %check export RUNTESTS="-k 'not test_dbm_backend and not test_memcached_backend and not test_redis_backend'" -%python_exec -m pytest +%python_exec -m pytest --ignore=test_lock.py %files %{python_files} %defattr(-,root,root,-) From e3b3fefea3dcbb467ad43c36544ddcebceb0f12a2e78c64dae898bc561413c02 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Apr 2018 12:56:56 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=37 --- python-dogpile.cache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec index 78e32bf..6cb7543 100644 --- a/python-dogpile.cache.spec +++ b/python-dogpile.cache.spec @@ -65,7 +65,7 @@ new value. %check export RUNTESTS="-k 'not test_dbm_backend and not test_memcached_backend and not test_redis_backend'" -%python_exec -m pytest --ignore=test_lock.py +%python_exec -m pytest --ignore=tests/test_lock.py %files %{python_files} %defattr(-,root,root,-) From d6c0e9b038b9b6c0f64eb4a2e65d4125bfef4f627d1cd0acf7f4edcfd7d640fd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Apr 2018 12:57:08 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=38 --- dogpile.cache-tests_more_slow_waiters.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 dogpile.cache-tests_more_slow_waiters.patch diff --git a/dogpile.cache-tests_more_slow_waiters.patch b/dogpile.cache-tests_more_slow_waiters.patch deleted file mode 100644 index 9cc43c8..0000000 --- a/dogpile.cache-tests_more_slow_waiters.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dogpile.cache-0.6.4/tests/test_lock.py 2018/03/17 11:48:50 1.1 -+++ dogpile.cache-0.6.4/tests/test_lock.py 2018/03/17 11:52:43 -@@ -227,6 +227,8 @@ - - if slow_write_time: - expected_slow_waiters = num_threads * expected_generations -+ # one extra for slow platforms -+ expected_slow_waiters += 2 - - # time spent also increments by one wait period in the beginning... - expected_run_time += effective_creation_time From 4a6e502bba4b2204310affbe19bfd4065493492b8840a367f9a9c5d048025ac7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Apr 2018 13:02:18 +0000 Subject: [PATCH 6/6] - for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=39 --- python-dogpile.cache.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes index 0c247dd..1179e1d 100644 --- a/python-dogpile.cache.changes +++ b/python-dogpile.cache.changes @@ -6,7 +6,7 @@ Mon Apr 23 12:54:25 UTC 2018 - dmueller@suse.com ------------------------------------------------------------------- Fri Apr 20 07:50:52 UTC 2018 - dmueller@suse.com -- for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch +- for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch ------------------------------------------------------------------- Thu Apr 19 13:00:53 UTC 2018 - dmueller@suse.com