summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/exclusions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-12-12 21:07:25 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2015-12-12 21:08:56 -0500
commit7d96ad4d535dc02a8ab1384df1db94dea2a045b5 (patch)
tree8b211ad42e32af56a1ceca46359f2804194d40f7 /lib/sqlalchemy/testing/exclusions.py
parentd67d04c70ac51322347e5f396e5d7dadfc75a987 (diff)
downloadsqlalchemy-7d96ad4d535dc02a8ab1384df1db94dea2a045b5.tar.gz
- Fixed bug where use of the :meth:`.Query.select_from` method would
cause a subsequent call to the :meth:`.Query.with_parent` method to fail. fixes #3606 - add mark-as-fail test for #3607
Diffstat (limited to 'lib/sqlalchemy/testing/exclusions.py')
-rw-r--r--lib/sqlalchemy/testing/exclusions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 2a5b4aa63..5d7baeb9c 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -398,8 +398,8 @@ def closed():
return skip_if(BooleanPredicate(True, "marked as skip"))
-def fails():
- return fails_if(BooleanPredicate(True, "expected to fail"))
+def fails(reason=None):
+ return fails_if(BooleanPredicate(True, reason or "expected to fail"))
@decorator