Hello community,
here is the log from the commit of package python-django-redis for
openSUSE:Factory checked in at 2019-02-24 17:15:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-redis (Old)
and /work/SRC/openSUSE:Factory/.python-django-redis.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-redis"
Sun Feb 24 17:15:44 2019 rev:4 rq:677660 version:4.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django-redis/python-django-redis.changes
2018-12-11 15:49:59.898062985 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-redis.new.28833/python-django-redis.changes
2019-02-24 17:15:57.144444652 +0100
@@ -1,0 +2,7 @@
+Wed Feb 20 11:11:17 UTC 2019 - John Vandenberg <[email protected]>
+
+- Add tests-fix-urls.patch fixing failing tests, which were using
+ URLs not able to be parsed correctly on Python 3 as a URL.
+ See https://github.com/andymccurdy/redis-py/issues/961
+
+-------------------------------------------------------------------
New:
----
tests-fix-urls.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-redis.spec ++++++
--- /var/tmp/diff_new_pack.EacSXS/_old 2019-02-24 17:15:57.848444527 +0100
+++ /var/tmp/diff_new_pack.EacSXS/_new 2019-02-24 17:15:57.856444525 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-django-redis
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,13 @@
Group: Development/Languages/Python
URL: https://github.com/niwibe/django-redis
Source:
https://files.pythonhosted.org/packages/source/d/django-redis/django-redis-%{version}.tar.gz
+# Fix tests to be compatible with Python 3 url parser.
+Patch0: tests-fix-urls.patch
BuildRequires: %{python_module Django >= 1.11}
BuildRequires: %{python_module lz4 >= 0.15}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module msgpack >= 0.4.6}
+BuildRequires: %{python_module pytest-django}
BuildRequires: %{python_module redis >= 2.10.0}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -46,6 +49,7 @@
%prep
%setup -q -n django-redis-%{version}
+%patch0 -p1
%build
%python_build
@@ -56,9 +60,20 @@
%check
/usr/sbin/redis-server --port 6379 &
+export PYTHONPATH=.:tests
%python_exec tests/runtests.py
-# The tests fail on python3 here
-#%%python_exec tests/runtests-sharded.py
+# The first four are errors on Python 2
+# The last three tests tests raise NotImplementedError
+%{python_expand DJANGO_SETTINGS_MODULE=tests.test_sqlite_sharding \
+ $python -m pytest \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTestEscapePrefix::test_keys \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTests::test_delete_pattern \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTests::test_touch_missed_key \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTests::test_touch_negative_timeout \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTests::test_touch_positive_timeout \
+ --deselect
tests/test_backend.py::DjangoRedisCacheTests::test_touch_zero_timeout \
+ tests
+}
%python_exec tests/runtests-herd.py
%python_exec tests/runtests-json.py
%python_exec tests/runtests-msgpack.py
++++++ tests-fix-urls.patch ++++++
diff -u django-redis-4.10.0-orig/tests/test_sqlite_herd.py
django-redis-4.10.0/tests/test_sqlite_herd.py
--- django-redis-4.10.0-orig/tests/test_sqlite_herd.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_herd.py 2019-02-20
18:07:26.878110390 +0700
@@ -4,7 +4,7 @@
'default': {
'BACKEND': 'django_redis.cache.RedisCache',
'LOCATION': [
- '127.0.0.1:6379:5',
+ 'redis://127.0.0.1:6379?db=5',
],
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.HerdClient',
@@ -19,7 +19,7 @@
},
'sample': {
'BACKEND': 'django_redis.cache.RedisCache',
- 'LOCATION': '127.0.0.1:6379:1,127.0.0.1:6379:1',
+ 'LOCATION': 'redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1',
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.HerdClient',
}
diff -u django-redis-4.10.0-orig/tests/test_sqlite_json.py
django-redis-4.10.0/tests/test_sqlite_json.py
--- django-redis-4.10.0-orig/tests/test_sqlite_json.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_json.py 2019-02-20
18:04:29.728741763 +0700
@@ -22,7 +22,7 @@
},
"sample": {
"BACKEND": "django_redis.cache.RedisCache",
- "LOCATION": "127.0.0.1:6379:1,127.0.0.1:6379:1",
+ "LOCATION": "redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
"SERIALIZER": "django_redis.serializers.json.JSONSerializer",
diff -u django-redis-4.10.0-orig/tests/test_sqlite_lz4.py
django-redis-4.10.0/tests/test_sqlite_lz4.py
--- django-redis-4.10.0-orig/tests/test_sqlite_lz4.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_lz4.py 2019-02-20
18:04:19.408662209 +0700
@@ -22,7 +22,7 @@
},
"sample": {
"BACKEND": "django_redis.cache.RedisCache",
- "LOCATION": "127.0.0.1:6379:1,127.0.0.1:6379:1",
+ "LOCATION": "127.0.0.1:6379?db=1,127.0.0.1:6379?db=1",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
"COMPRESSOR": "django_redis.compressors.lz4.Lz4Compressor",
diff -u django-redis-4.10.0-orig/tests/test_sqlite_msgpack.py
django-redis-4.10.0/tests/test_sqlite_msgpack.py
--- django-redis-4.10.0-orig/tests/test_sqlite_msgpack.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_msgpack.py 2019-02-20
18:04:11.648602403 +0700
@@ -22,7 +22,7 @@
},
"sample": {
"BACKEND": "django_redis.cache.RedisCache",
- "LOCATION": "127.0.0.1:6379:1,127.0.0.1:6379:1",
+ "LOCATION": "redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
"SERIALIZER": "django_redis.serializers.msgpack.MSGPackSerializer",
diff -u django-redis-4.10.0-orig/tests/test_sqlite.py
django-redis-4.10.0/tests/test_sqlite.py
--- django-redis-4.10.0-orig/tests/test_sqlite.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite.py 2019-02-20 18:33:38.606001141
+0700
@@ -20,7 +20,7 @@
},
"sample": {
"BACKEND": "django_redis.cache.RedisCache",
- "LOCATION": "127.0.0.1:6379:1,127.0.0.1:6379:1",
+ "LOCATION": "redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
}
diff -u django-redis-4.10.0-orig/tests/test_sqlite_sharding.py
django-redis-4.10.0/tests/test_sqlite_sharding.py
--- django-redis-4.10.0-orig/tests/test_sqlite_sharding.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_sharding.py 2019-02-20
18:33:24.753899936 +0700
@@ -4,8 +4,8 @@
'default': {
'BACKEND': 'django_redis.cache.RedisCache',
'LOCATION': [
- '127.0.0.1:6379:1',
- '127.0.0.1:6379:2',
+ 'redis://127.0.0.1:6379?db=1',
+ 'redis://127.0.0.1:6379?db=2',
],
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.ShardClient',
@@ -23,7 +23,7 @@
},
'sample': {
'BACKEND': 'django_redis.cache.RedisCache',
- 'LOCATION': '127.0.0.1:6379:1,127.0.0.1:6379:1',
+ 'LOCATION': 'redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1',
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.ShardClient',
}
diff -u django-redis-4.10.0-orig/tests/test_sqlite_usock.py
django-redis-4.10.0/tests/test_sqlite_usock.py
--- django-redis-4.10.0-orig/tests/test_sqlite_usock.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_usock.py 2019-02-20
18:03:45.416400309 +0700
@@ -20,7 +20,7 @@
},
'sample': {
'BACKEND': 'redis_cache.cache.RedisCache',
- 'LOCATION': '127.0.0.1:6379:1,127.0.0.1:6379:1',
+ 'LOCATION': 'redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1',
'OPTIONS': {
'CLIENT_CLASS': 'redis_cache.client.DefaultClient',
}
diff -u django-redis-4.10.0-orig/tests/test_sqlite_zlib.py
django-redis-4.10.0/tests/test_sqlite_zlib.py
--- django-redis-4.10.0-orig/tests/test_sqlite_zlib.py 2018-11-19
15:48:56.000000000 +0700
+++ django-redis-4.10.0/tests/test_sqlite_zlib.py 2019-02-20
18:03:54.064466919 +0700
@@ -22,7 +22,7 @@
},
"sample": {
"BACKEND": "django_redis.cache.RedisCache",
- "LOCATION": "127.0.0.1:6379:1,127.0.0.1:6379:1",
+ "LOCATION": "redis://127.0.0.1:6379?db=1,redis://127.0.0.1:6379?db=1",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
"COMPRESSOR": "django_redis.compressors.zlib.ZlibCompressor",
