Refactor tests out of packaged module for acme plugin (#7600)

* Move acme tests to tests/ directory outside of acme module

* Fix call to messages_test in client_test

* Move test_util.py and testdata/ into tests/

* Update manifest to package tests

* Exclude pycache and .py[cod]

34 files changed, 10 insertions, 8 deletions

diff --git a/acme/MANIFEST.in b/acme/MANIFEST.in
index 1619bef69..de254250e 100644
--- a/acme/MANIFEST.in
+++ b/acme/MANIFEST.in
@@ -3,4 +3,6 @@ include README.rst
 include pytest.ini
 recursive-include docs *
 recursive-include examples *
-recursive-include acme/testdata *
+recursive-include tests *
+global-exclude __pycache__
+global-exclude *.py[cod]
diff --git a/acme/acme/challenges_test.py b/acme/tests/challenges_test.py
index 4f728e4a4..819ba9261 100644
--- a/acme/acme/challenges_test.py
+++ b/acme/tests/challenges_test.py
@@ -7,7 +7,7 @@ import requests
 
 from six.moves.urllib import parse as urllib_parse  # pylint: disable=relative-import
 
-from acme import test_util
+import test_util
 
 CERT = test_util.load_comparable_cert('cert.pem')
 KEY = jose.JWKRSA(key=test_util.load_rsa_private_key('rsa512_key.pem'))
diff --git a/acme/acme/client_test.py b/acme/tests/client_test.py
index a53ce799b..22eb3fc45 100644
--- a/acme/acme/client_test.py
+++ b/acme/tests/client_test.py
@@ -16,10 +16,10 @@ from acme import challenges
 from acme import errors
 from acme import jws as acme_jws
 from acme import messages
-from acme import messages_test
-from acme import test_util
 from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
 
+import messages_test
+import test_util
 
 CERT_DER = test_util.load_vector('cert.der')
 CERT_SAN_PEM = test_util.load_vector('cert-san.pem')
diff --git a/acme/acme/crypto_util_test.py b/acme/tests/crypto_util_test.py
index 6477f6501..d351c1a3d 100644
--- a/acme/acme/crypto_util_test.py
+++ b/acme/tests/crypto_util_test.py
@@ -12,9 +12,9 @@ import josepy as jose
 import OpenSSL
 
 from acme import errors
-from acme import test_util
 from acme.magic_typing import List # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 class SSLSocketAndProbeSNITest(unittest.TestCase):
     """Tests for acme.crypto_util.SSLSocket/probe_sni."""
diff --git a/acme/acme/errors_test.py b/acme/tests/errors_test.py
index 1e5f3d479..1e5f3d479 100644
--- a/acme/acme/errors_test.py
+++ b/acme/tests/errors_test.py
diff --git a/acme/acme/fields_test.py b/acme/tests/fields_test.py
index 69dde8b89..69dde8b89 100644
--- a/acme/acme/fields_test.py
+++ b/acme/tests/fields_test.py
diff --git a/acme/acme/jose_test.py b/acme/tests/jose_test.py
index 340624a4f..340624a4f 100644
--- a/acme/acme/jose_test.py
+++ b/acme/tests/jose_test.py
diff --git a/acme/acme/jws_test.py b/acme/tests/jws_test.py
index aa3ccb700..e43ed55e6 100644
--- a/acme/acme/jws_test.py
+++ b/acme/tests/jws_test.py
@@ -3,7 +3,7 @@ import unittest
 
 import josepy as jose
 
-from acme import test_util
+import test_util
 
 
 KEY = jose.JWKRSA.load(test_util.load_vector('rsa512_key.pem'))
diff --git a/acme/acme/magic_typing_test.py b/acme/tests/magic_typing_test.py
index 23dfe3367..23dfe3367 100644
--- a/acme/acme/magic_typing_test.py
+++ b/acme/tests/magic_typing_test.py
diff --git a/acme/acme/messages_test.py b/acme/tests/messages_test.py
index 7efaaa1a3..269970b1c 100644
--- a/acme/acme/messages_test.py
+++ b/acme/tests/messages_test.py
@@ -5,9 +5,9 @@ import josepy as jose
 import mock
 
 from acme import challenges
-from acme import test_util
 from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 CERT = test_util.load_comparable_cert('cert.der')
 CSR = test_util.load_comparable_csr('csr.der')
diff --git a/acme/acme/standalone_test.py b/acme/tests/standalone_test.py
index 9f9249b07..0be57bad4 100644
--- a/acme/acme/standalone_test.py
+++ b/acme/tests/standalone_test.py
@@ -11,9 +11,9 @@ import mock
 import requests
 
 from acme import challenges
-from acme import test_util
 from acme.magic_typing import Set # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 class TLSServerTest(unittest.TestCase):
     """Tests for acme.standalone.TLSServer."""
diff --git a/acme/acme/test_util.py b/acme/tests/test_util.py
index 6737bff4e..6737bff4e 100644
--- a/acme/acme/test_util.py
+++ b/acme/tests/test_util.py
diff --git a/acme/acme/testdata/README b/acme/tests/testdata/README
index dfe3f5405..dfe3f5405 100644
--- a/acme/acme/testdata/README
+++ b/acme/tests/testdata/README
diff --git a/acme/acme/testdata/cert-100sans.pem b/acme/tests/testdata/cert-100sans.pem
index 3fdc9404f..3fdc9404f 100644
--- a/acme/acme/testdata/cert-100sans.pem
+++ b/acme/tests/testdata/cert-100sans.pem
diff --git a/acme/acme/testdata/cert-idnsans.pem b/acme/tests/testdata/cert-idnsans.pem
index 932649692..932649692 100644
--- a/acme/acme/testdata/cert-idnsans.pem
+++ b/acme/tests/testdata/cert-idnsans.pem
diff --git a/acme/acme/testdata/cert-nocn.der b/acme/tests/testdata/cert-nocn.der
index 59da83ccc..59da83ccc 100644
--- a/acme/acme/testdata/cert-nocn.der
+++ b/acme/tests/testdata/cert-nocn.der
diff --git a/acme/acme/testdata/cert-san.pem b/acme/tests/testdata/cert-san.pem
index dcb835994..dcb835994 100644
--- a/acme/acme/testdata/cert-san.pem
+++ b/acme/tests/testdata/cert-san.pem
diff --git a/acme/acme/testdata/cert.der b/acme/tests/testdata/cert.der
index ab231982f..ab231982f 100644
--- a/acme/acme/testdata/cert.der
+++ b/acme/tests/testdata/cert.der
diff --git a/acme/acme/testdata/cert.pem b/acme/tests/testdata/cert.pem
index 96c55cbf4..96c55cbf4 100644
--- a/acme/acme/testdata/cert.pem
+++ b/acme/tests/testdata/cert.pem
diff --git a/acme/acme/testdata/critical-san.pem b/acme/tests/testdata/critical-san.pem
index 7aec8ab1c..7aec8ab1c 100644
--- a/acme/acme/testdata/critical-san.pem
+++ b/acme/tests/testdata/critical-san.pem
diff --git a/acme/acme/testdata/csr-100sans.pem b/acme/tests/testdata/csr-100sans.pem
index 199814126..199814126 100644
--- a/acme/acme/testdata/csr-100sans.pem
+++ b/acme/tests/testdata/csr-100sans.pem
diff --git a/acme/acme/testdata/csr-6sans.pem b/acme/tests/testdata/csr-6sans.pem
index 8f6b52bd7..8f6b52bd7 100644
--- a/acme/acme/testdata/csr-6sans.pem
+++ b/acme/tests/testdata/csr-6sans.pem
diff --git a/acme/acme/testdata/csr-idnsans.pem b/acme/tests/testdata/csr-idnsans.pem
index d6e91a420..d6e91a420 100644
--- a/acme/acme/testdata/csr-idnsans.pem
+++ b/acme/tests/testdata/csr-idnsans.pem
diff --git a/acme/acme/testdata/csr-nosans.pem b/acme/tests/testdata/csr-nosans.pem
index 813db67b0..813db67b0 100644
--- a/acme/acme/testdata/csr-nosans.pem
+++ b/acme/tests/testdata/csr-nosans.pem
diff --git a/acme/acme/testdata/csr-san.pem b/acme/tests/testdata/csr-san.pem
index a7128e35c..a7128e35c 100644
--- a/acme/acme/testdata/csr-san.pem
+++ b/acme/tests/testdata/csr-san.pem
diff --git a/acme/acme/testdata/csr.der b/acme/tests/testdata/csr.der
index d43ac85a1..d43ac85a1 100644
--- a/acme/acme/testdata/csr.der
+++ b/acme/tests/testdata/csr.der
diff --git a/acme/acme/testdata/csr.pem b/acme/tests/testdata/csr.pem
index b6818e39d..b6818e39d 100644
--- a/acme/acme/testdata/csr.pem
+++ b/acme/tests/testdata/csr.pem
diff --git a/acme/acme/testdata/dsa512_key.pem b/acme/tests/testdata/dsa512_key.pem
index 78e164712..78e164712 100644
--- a/acme/acme/testdata/dsa512_key.pem
+++ b/acme/tests/testdata/dsa512_key.pem
diff --git a/acme/acme/testdata/rsa1024_key.pem b/acme/tests/testdata/rsa1024_key.pem
index de5339d03..de5339d03 100644
--- a/acme/acme/testdata/rsa1024_key.pem
+++ b/acme/tests/testdata/rsa1024_key.pem
diff --git a/acme/acme/testdata/rsa2048_cert.pem b/acme/tests/testdata/rsa2048_cert.pem
index 3944cd1db..3944cd1db 100644
--- a/acme/acme/testdata/rsa2048_cert.pem
+++ b/acme/tests/testdata/rsa2048_cert.pem
diff --git a/acme/acme/testdata/rsa2048_key.pem b/acme/tests/testdata/rsa2048_key.pem
index 5847aed55..5847aed55 100644
--- a/acme/acme/testdata/rsa2048_key.pem
+++ b/acme/tests/testdata/rsa2048_key.pem
diff --git a/acme/acme/testdata/rsa256_key.pem b/acme/tests/testdata/rsa256_key.pem
index 659274d1d..659274d1d 100644
--- a/acme/acme/testdata/rsa256_key.pem
+++ b/acme/tests/testdata/rsa256_key.pem
diff --git a/acme/acme/testdata/rsa512_key.pem b/acme/tests/testdata/rsa512_key.pem
index 610c8d315..610c8d315 100644
--- a/acme/acme/testdata/rsa512_key.pem
+++ b/acme/tests/testdata/rsa512_key.pem
diff --git a/acme/acme/util_test.py b/acme/tests/util_test.py
index 00aa8b02d..00aa8b02d 100644
--- a/acme/acme/util_test.py
+++ b/acme/tests/util_test.py