fix/skip tests that are broken on SQLite 3.30
This commit is contained in:
parent
d5d5470807
commit
cf84a89d99
56
python-sqlalchemy-1.3.10-sqlite-3.30.patch
Normal file
56
python-sqlalchemy-1.3.10-sqlite-3.30.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nils Philippsen <nils@tiptoe.de>
|
||||||
|
Date: Thu, 17 Oct 2019 18:22:09 +0200
|
||||||
|
Subject: [PATCH 1/2] Expect ordering NULLs to work on sqlite >= 3.30.
|
||||||
|
|
||||||
|
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
|
||||||
|
---
|
||||||
|
test/requirements.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/requirements.py b/test/requirements.py
|
||||||
|
index a0d984ef4..7dde12f56 100644
|
||||||
|
--- a/test/requirements.py
|
||||||
|
+++ b/test/requirements.py
|
||||||
|
@@ -772,7 +772,8 @@ class DefaultRequirements(SuiteRequirements):
|
||||||
|
@property
|
||||||
|
def nullsordering(self):
|
||||||
|
"""Target backends that support nulls ordering."""
|
||||||
|
- return fails_on_everything_except("postgresql", "oracle", "firebird")
|
||||||
|
+ return fails_on_everything_except("postgresql", "oracle", "firebird",
|
||||||
|
+ "sqlite >= 3.30.0")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def reflects_pk_names(self):
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
|
|
||||||
|
From e18534a9045786efdaf4963515222838c62e0300 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nils Philippsen <nils@tiptoe.de>
|
||||||
|
Date: Fri, 18 Oct 2019 10:09:16 +0200
|
||||||
|
Subject: [PATCH 2/2] Skip nested aggregate tests on sqlite.
|
||||||
|
|
||||||
|
This seems to have stopped working with SQLite 3.30.
|
||||||
|
|
||||||
|
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
|
||||||
|
---
|
||||||
|
test/requirements.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/requirements.py b/test/requirements.py
|
||||||
|
index 7dde12f56..388131cc9 100644
|
||||||
|
--- a/test/requirements.py
|
||||||
|
+++ b/test/requirements.py
|
||||||
|
@@ -788,7 +788,7 @@ class DefaultRequirements(SuiteRequirements):
|
||||||
|
"""target database can select an aggregate from a subquery that's
|
||||||
|
also using an aggregate"""
|
||||||
|
|
||||||
|
- return skip_if(["mssql"])
|
||||||
|
+ return skip_if(["mssql", "sqlite"])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def array_type(self):
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
@ -18,6 +18,10 @@ License: MIT
|
|||||||
URL: http://www.sqlalchemy.org/
|
URL: http://www.sqlalchemy.org/
|
||||||
Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{srcversion}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{srcversion}.tar.gz
|
||||||
|
|
||||||
|
# https://github.com/sqlalchemy/sqlalchemy/issues/4920
|
||||||
|
# https://github.com/sqlalchemy/sqlalchemy/pull/4921
|
||||||
|
Patch0: python-sqlalchemy-1.3.10-sqlite-3.30.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
|
||||||
BuildRequires: python2-devel >= 2.6
|
BuildRequires: python2-devel >= 2.6
|
||||||
@ -90,6 +94,8 @@ This package includes the python 3 version of the module.
|
|||||||
%prep
|
%prep
|
||||||
%setup -n %{srcname}-%{srcversion}
|
%setup -n %{srcname}-%{srcversion}
|
||||||
|
|
||||||
|
%patch0 -p1 -b .sqlite-3.30
|
||||||
|
|
||||||
# Remove flag for pytest-xdist. (python2-pytest-xdist is a removed dependency.)
|
# Remove flag for pytest-xdist. (python2-pytest-xdist is a removed dependency.)
|
||||||
# (--max-worker-restart=5 would end the test run after 5 crashing tests.)
|
# (--max-worker-restart=5 would end the test run after 5 crashing tests.)
|
||||||
sed -i -e's/\(addopts = .*\) --max-worker-restart=5/\1/' setup.cfg
|
sed -i -e's/\(addopts = .*\) --max-worker-restart=5/\1/' setup.cfg
|
||||||
@ -139,6 +145,9 @@ PYTHONPATH=. %{__python3} -m pytest test \
|
|||||||
# with_python3
|
# with_python3
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 18 2019 Nils Philippsen <nils@tiptoe.de> - 1.3.10-1
|
||||||
|
- fix/skip tests that are broken on SQLite 3.30
|
||||||
|
|
||||||
* Wed Oct 16 2019 Nils Philippsen <nils@tiptoe.de> - 1.3.10-1
|
* Wed Oct 16 2019 Nils Philippsen <nils@tiptoe.de> - 1.3.10-1
|
||||||
- version 1.3.10
|
- version 1.3.10
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user