diff options
author | Alex Stapleton <alexs@prol.etari.at> | 2014-03-27 16:38:00 +0000 |
---|---|---|
committer | Alex Stapleton <alexs@prol.etari.at> | 2014-03-27 16:38:00 +0000 |
commit | 5e4c8c3666860fbe7320ea2227428f530cc8f176 (patch) | |
tree | 0da4c43bf5c31f13b6cc6f677ce0d068ecaae055 /tests/test_utils.py | |
parent | d80195e1712469ae59d1f9adc306ebfa23cfb59c (diff) | |
download | pyca-cryptography-5e4c8c3666860fbe7320ea2227428f530cc8f176.zip pyca-cryptography-5e4c8c3666860fbe7320ea2227428f530cc8f176.tar.gz pyca-cryptography-5e4c8c3666860fbe7320ea2227428f530cc8f176.tar.bz2 |
Fixes to @alex's comments
Diffstat (limited to 'tests/test_utils.py')
-rw-r--r-- | tests/test_utils.py | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py index b430f56..939845f 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1612,35 +1612,38 @@ def test_vector_version(): assert cryptography.__version__ == cryptography_vectors.__version__ -@pytest.mark.xfail def test_raises_unsupported_algorithm_wrong_type(): - # Check that it asserts if the wrong type of exception is raised. - with raises_unsupported_algorithm(None): - raise Exception + # Check that it raises if the wrong type of exception is raised. + class TestException(Exception): + pass + + with pytest.raises(TestException): + with raises_unsupported_algorithm(None): + raise TestException -@pytest.mark.xfail def test_raises_unsupported_algorithm_wrong_reason(): - # Check that it asserts if the wrong reason code is raised. - with raises_unsupported_algorithm(None): - raise UnsupportedAlgorithm("An error.", - _Reasons.BACKEND_MISSING_INTERFACE) + # Check that it fails if the wrong reason code is raised. + with pytest.raises(pytest.fail.Exception): + with raises_unsupported_algorithm(None): + raise UnsupportedAlgorithm("An error.", + _Reasons.BACKEND_MISSING_INTERFACE) -@pytest.mark.xfail def test_raises_unsupported_no_exc(): - # Check that it raises if no exception is raised. - with raises_unsupported_algorithm( - _Reasons.BACKEND_MISSING_INTERFACE - ): - pass + # Check that it fails if no exception is raised. + with pytest.raises(pytest.fail.Exception): + with raises_unsupported_algorithm( + _Reasons.BACKEND_MISSING_INTERFACE + ): + pass def test_raises_unsupported_algorithm(): # Check that it doesnt assert if the right things are raised. with raises_unsupported_algorithm( _Reasons.BACKEND_MISSING_INTERFACE - ) as exc: + ) as exc_info: raise UnsupportedAlgorithm("An error.", _Reasons.BACKEND_MISSING_INTERFACE) - assert exc + assert exc_info.type is UnsupportedAlgorithm |