From ce0d781707979ccb7f6983601c5ccb25d2354582 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sun, 27 Oct 2013 16:52:33 -0400
Subject: Move the bindings into the hazmat module

---
 tests/bindings/__init__.py             |  0
 tests/bindings/test_openssl.py         | 41 ----------------------------------
 tests/conftest.py                      |  2 +-
 tests/hazmat/bindings/__init__.py      |  0
 tests/hazmat/bindings/test_openssl.py  | 41 ++++++++++++++++++++++++++++++++++
 tests/hazmat/primitives/test_hashes.py |  3 +--
 tests/hazmat/primitives/utils.py       |  2 +-
 7 files changed, 44 insertions(+), 45 deletions(-)
 delete mode 100644 tests/bindings/__init__.py
 delete mode 100644 tests/bindings/test_openssl.py
 create mode 100644 tests/hazmat/bindings/__init__.py
 create mode 100644 tests/hazmat/bindings/test_openssl.py

(limited to 'tests')

diff --git a/tests/bindings/__init__.py b/tests/bindings/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/bindings/test_openssl.py b/tests/bindings/test_openssl.py
deleted file mode 100644
index 69ab38d0..00000000
--- a/tests/bindings/test_openssl.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import pytest
-
-from cryptography.bindings.openssl.backend import backend
-from cryptography.hazmat.primitives.block.ciphers import AES
-from cryptography.hazmat.primitives.block.modes import CBC
-
-
-class TestOpenSSL(object):
-    def test_backend_exists(self):
-        assert backend
-
-    def test_openssl_version_text(self):
-        """
-        This test checks the value of OPENSSL_VERSION_TEXT.
-
-        Unfortunately, this define does not appear to have a
-        formal content definition, so for now we'll test to see
-        if it starts with OpenSSL as that appears to be true
-        for every OpenSSL.
-        """
-        assert backend.openssl_version_text().startswith("OpenSSL")
-
-    def test_supports_cipher(self):
-        assert backend.ciphers.supported(None, None) is False
-
-    def test_register_duplicate_cipher_adapter(self):
-        with pytest.raises(ValueError):
-            backend.ciphers.register_cipher_adapter(AES, CBC, None)
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)
diff --git a/tests/hazmat/bindings/__init__.py b/tests/hazmat/bindings/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
new file mode 100644
index 00000000..9ce882e4
--- /dev/null
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -0,0 +1,41 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+from cryptography.hazmat.bindings.openssl.backend import backend
+from cryptography.hazmat.primitives.block.ciphers import AES
+from cryptography.hazmat.primitives.block.modes import CBC
+
+
+class TestOpenSSL(object):
+    def test_backend_exists(self):
+        assert backend
+
+    def test_openssl_version_text(self):
+        """
+        This test checks the value of OPENSSL_VERSION_TEXT.
+
+        Unfortunately, this define does not appear to have a
+        formal content definition, so for now we'll test to see
+        if it starts with OpenSSL as that appears to be true
+        for every OpenSSL.
+        """
+        assert backend.openssl_version_text().startswith("OpenSSL")
+
+    def test_supports_cipher(self):
+        assert backend.ciphers.supported(None, None) is False
+
+    def test_register_duplicate_cipher_adapter(self):
+        with pytest.raises(ValueError):
+            backend.ciphers.register_cipher_adapter(AES, CBC, None)
diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py
index 110ca4b7..797fe4ff 100644
--- a/tests/hazmat/primitives/test_hashes.py
+++ b/tests/hazmat/primitives/test_hashes.py
@@ -19,8 +19,7 @@ import pytest
 
 import six
 
-from cryptography.bindings import _default_backend
-
+from cryptography.hazmat.bindings import _default_backend
 from cryptography.hazmat.primitives import hashes
 
 from .utils import generate_base_hash_test
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index 79d0aba4..fabdca01 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -3,7 +3,7 @@ import os
 
 import pytest
 
-from cryptography.bindings import _ALL_BACKENDS
+from cryptography.hazmat.bindings import _ALL_BACKENDS
 from cryptography.hazmat.primitives.block import BlockCipher
 
 
-- 
cgit v1.2.3