summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2019-08-29 18:01:14 +0300
committerSam Thursfield <sam@afuera.me.uk>2019-10-02 13:44:19 +0200
commit205bf936bc964892ed97e7f291dff3ccaf60cd49 (patch)
tree93e13dd3a328190ffc5a8b7f427041c43115ad5f
parent9307efded641392e9f55f213f035f352710829e8 (diff)
downloadtracker-205bf936bc964892ed97e7f291dff3ccaf60cd49.tar.gz
functional-tests: Fix brokeness of @expectedFailureJournal decorator
-rw-r--r--tests/functional-tests/expectedFailure.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/functional-tests/expectedFailure.py b/tests/functional-tests/expectedFailure.py
index 289e0a9df..d3d48b468 100644
--- a/tests/functional-tests/expectedFailure.py
+++ b/tests/functional-tests/expectedFailure.py
@@ -27,6 +27,7 @@ on the files. Note that these tests are highly platform dependant.
from functools import wraps
import sys
+import unittest as ut
import configuration as cfg
@@ -42,11 +43,6 @@ def expectedFailureJournal():
@wraps(func)
def wrapper(*args, **kwargs):
- try:
- func(*args, **kwargs)
- except Exception:
- raise ut.case._ExpectedFailure(sys.exc_info())
- raise Exception(
- "Unexpected success. This should fail because journal is disabled")
+ ut.expectedFailure(func)
return wrapper
return decorator