diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-30 21:07:00 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-30 21:07:00 -0800 |
| commit | 937451ee2771960bdea1bb3414c07da07c2baa71 (patch) | |
| tree | 5e1b4a03c75f6b93e4618c866874d3ff8729c667 /pytest.ini | |
| parent | b9bc6c3e4c9b647de1a1a2dd852ab591e9a69b01 (diff) | |
| parent | fbd7ffcdcda0269a654ebf373d4ec5f1e6d6d3f4 (diff) | |
| download | cryptography-937451ee2771960bdea1bb3414c07da07c2baa71.tar.gz cryptography-937451ee2771960bdea1bb3414c07da07c2baa71.tar.bz2 cryptography-937451ee2771960bdea1bb3414c07da07c2baa71.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,3 +4,4 @@ markers = hmac: this test requires a backend providing HMACBackend cipher: this test requires a backend providing CipherBackend hash: this test requires a backend providing HashBackend + supported: parametrized test requiring only_if and skip_message |