aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/conftest.py4
-rw-r--r--tests/hazmat/backends/test_openssl_memleak.py2
-rw-r--r--tests/hazmat/primitives/test_dsa.py2
-rw-r--r--tests/hazmat/primitives/test_ec.py6
-rw-r--r--tests/hazmat/primitives/test_rsa.py4
-rw-r--r--tests/hazmat/primitives/test_x963_vectors.py2
-rw-r--r--tests/hazmat/primitives/utils.py4
-rw-r--r--tests/utils.py6
8 files changed, 15 insertions, 15 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index d858b4f7..fd690ce7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,7 +14,7 @@ from .utils import (
def pytest_report_header(config):
- return "OpenSSL: {0}".format(openssl_backend.openssl_version_text())
+ return "OpenSSL: {}".format(openssl_backend.openssl_version_text())
def pytest_addoption(parser):
@@ -43,7 +43,7 @@ def backend(request):
isinstance(openssl_backend, iface) for iface in required_interfaces
):
pytest.skip(
- "OpenSSL doesn't implement required interfaces: {0}".format(
+ "OpenSSL doesn't implement required interfaces: {}".format(
required_interfaces
)
)
diff --git a/tests/hazmat/backends/test_openssl_memleak.py b/tests/hazmat/backends/test_openssl_memleak.py
index 1db103b5..ed22b5db 100644
--- a/tests/hazmat/backends/test_openssl_memleak.py
+++ b/tests/hazmat/backends/test_openssl_memleak.py
@@ -128,7 +128,7 @@ def assert_no_memory_leaks(s, argv=[]):
env = os.environ.copy()
env["PYTHONPATH"] = os.pathsep.join(sys.path)
argv = [
- sys.executable, "-c", "{0}\n\n{1}".format(s, MEMORY_LEAK_SCRIPT)
+ sys.executable, "-c", "{}\n\n{}".format(s, MEMORY_LEAK_SCRIPT)
] + argv
# Shell out to a fresh Python process because OpenSSL does not allow you to
# install new memory hooks after the first malloc/free occurs.
diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py
index efd2239c..9e1acf93 100644
--- a/tests/hazmat/primitives/test_dsa.py
+++ b/tests/hazmat/primitives/test_dsa.py
@@ -36,7 +36,7 @@ def _skip_if_dsa_not_supported(backend, algorithm, p, q, g):
not backend.dsa_hash_supported(algorithm)
):
pytest.skip(
- "{0} does not support the provided parameters".format(backend)
+ "{} does not support the provided parameters".format(backend)
)
diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py
index 7a6d6aff..1f3a67d3 100644
--- a/tests/hazmat/primitives/test_ec.py
+++ b/tests/hazmat/primitives/test_ec.py
@@ -45,7 +45,7 @@ def _skip_ecdsa_vector(backend, curve_type, hash_type):
curve_type()
):
pytest.skip(
- "ECDSA not supported with this hash {0} and curve {1}".format(
+ "ECDSA not supported with this hash {} and curve {}".format(
hash_type().name, curve_type().name
)
)
@@ -54,7 +54,7 @@ def _skip_ecdsa_vector(backend, curve_type, hash_type):
def _skip_curve_unsupported(backend, curve):
if not backend.elliptic_curve_supported(curve):
pytest.skip(
- "Curve {0} is not supported by this backend {1}".format(
+ "Curve {} is not supported by this backend {}".format(
curve.name, backend
)
)
@@ -65,7 +65,7 @@ def _skip_exchange_algorithm_unsupported(backend, algorithm, curve):
algorithm, curve
):
pytest.skip(
- "Exchange with {0} curve is not supported by {1}".format(
+ "Exchange with {} curve is not supported by {}".format(
curve.name, backend
)
)
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index 65d88f54..9a0aaf1a 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -89,7 +89,7 @@ def _build_oaep_sha2_vectors():
load_vectors_from_file(
os.path.join(
base_path,
- "oaep-{0}-{1}.txt".format(
+ "oaep-{}-{}.txt".format(
mgf1alg.name, oaepalg.name
)
),
@@ -112,7 +112,7 @@ def _skip_pss_hash_algorithm_unsupported(backend, hash_alg):
)
):
pytest.skip(
- "Does not support {0} in MGF1 using PSS.".format(hash_alg.name)
+ "Does not support {} in MGF1 using PSS.".format(hash_alg.name)
)
diff --git a/tests/hazmat/primitives/test_x963_vectors.py b/tests/hazmat/primitives/test_x963_vectors.py
index 4a945d47..c75afa41 100644
--- a/tests/hazmat/primitives/test_x963_vectors.py
+++ b/tests/hazmat/primitives/test_x963_vectors.py
@@ -21,7 +21,7 @@ from ...utils import load_vectors_from_file, load_x963_vectors
def _skip_hashfn_unsupported(backend, hashfn):
if not backend.hash_supported(hashfn):
pytest.skip(
- "Hash {0} is not supported by this backend {1}".format(
+ "Hash {} is not supported by this backend {}".format(
hashfn.name, backend
)
)
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index 811dcf90..4aa5ce71 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -387,13 +387,13 @@ def kbkdf_counter_mode_test(backend, params):
algorithm = supported_algorithms.get(params.get('prf'))
if algorithm is None or not backend.hmac_supported(algorithm()):
- pytest.skip("KBKDF does not support algorithm: {0}".format(
+ pytest.skip("KBKDF does not support algorithm: {}".format(
params.get('prf')
))
ctr_loc = supported_counter_locations.get(params.get("ctrlocation"))
if ctr_loc is None or not isinstance(ctr_loc, CounterLocation):
- pytest.skip("Does not support counter location: {0}".format(
+ pytest.skip("Does not support counter location: {}".format(
params.get('ctrlocation')
))
diff --git a/tests/utils.py b/tests/utils.py
index b4812808..1362e906 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -30,7 +30,7 @@ KeyedHashVector = collections.namedtuple(
def check_backend_support(backend, item):
for mark in item.node.iter_markers("supported"):
if not mark.kwargs["only_if"](backend):
- pytest.skip("{0} ({1})".format(
+ pytest.skip("{} ({})".format(
mark.kwargs["skip_message"], backend
))
@@ -396,7 +396,7 @@ def load_fips_dsa_sig_vectors(vector_data):
sha_match = sha_regex.match(line)
if sha_match:
- digest_algorithm = "SHA-{0}".format(sha_match.group("sha"))
+ digest_algorithm = "SHA-{}".format(sha_match.group("sha"))
if line.startswith("[mod"):
continue
@@ -511,7 +511,7 @@ def load_fips_ecdsa_signing_vectors(vector_data):
curve_match = curve_rx.match(line)
if curve_match:
curve_name = _ECDSA_CURVE_NAMES[curve_match.group("curve")]
- digest_name = "SHA-{0}".format(curve_match.group("sha"))
+ digest_name = "SHA-{}".format(curve_match.group("sha"))
elif line.startswith("Msg = "):
if data is not None:
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 13:47:39 +0000