diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-28 10:09:15 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-28 10:09:15 -0700 |
commit | 9d683f71433ca4f2a09052159dc10d2f2dcb3222 (patch) | |
tree | 86928a635b22a4dc36bce266550323533e166ff8 /tests/conftest.py | |
parent | 01fbdf74967f8e22e3ea2d15f195898c64d34cc3 (diff) | |
parent | 0a1550e86fbb8a64a1f534babd76da5afd1c4c11 (diff) | |
download | cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.tar.gz cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.tar.bz2 cryptography-9d683f71433ca4f2a09052159dc10d2f2dcb3222.zip |
Merge pull request #188 from dstufft/hazmat
Create a Hazardous Materials Area
Diffstat (limited to 'tests/conftest.py')
-rw-r--r-- | tests/conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index d2ba03de..fab40b14 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,5 @@ def pytest_generate_tests(metafunc): - from cryptography.bindings import _ALL_BACKENDS + from cryptography.hazmat.bindings import _ALL_BACKENDS if "backend" in metafunc.fixturenames: metafunc.parametrize("backend", _ALL_BACKENDS) |