|
 |
e65c7f |
From da48b31f7d1e247ed6e00ee09b8c80ca0231e507 Mon Sep 17 00:00:00 2001
|
|
|
e65c7f |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
e65c7f |
Date: Mon, 14 Aug 2017 13:34:17 +0200
|
|
|
e65c7f |
Subject: [PATCH 2/4] Disable unsupported tests
|
|
|
e65c7f |
|
|
|
e65c7f |
pytest 2.7 does not support context manager for deprecated_call().
|
|
|
e65c7f |
---
|
|
|
e65c7f |
tests/test_x509.py | 3 ++-
|
|
|
e65c7f |
tests/test_x509_ext.py | 3 ++-
|
|
|
e65c7f |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
e65c7f |
|
|
|
e65c7f |
diff --git a/tests/test_x509.py b/tests/test_x509.py
|
|
|
e65c7f |
index 966cba6f..fce617cc 100644
|
|
|
e65c7f |
--- a/tests/test_x509.py
|
|
|
e65c7f |
+++ b/tests/test_x509.py
|
|
|
e65c7f |
@@ -527,7 +527,8 @@ class TestRSACertificate(object):
|
|
|
e65c7f |
assert cert.serial == 2
|
|
|
e65c7f |
assert cert.serial_number == 2
|
|
|
e65c7f |
|
|
|
e65c7f |
- def test_cert_serial_warning(self, backend):
|
|
|
e65c7f |
+ def DISABLED_test_cert_serial_warning(self, backend):
|
|
|
e65c7f |
+ # pytest 2.7 does not support context manager for deprecated_call()
|
|
|
e65c7f |
cert = _load_cert(
|
|
|
e65c7f |
os.path.join("x509", "PKITS_data", "certs", "GoodCACert.crt"),
|
|
|
e65c7f |
x509.load_der_x509_certificate,
|
|
|
e65c7f |
diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py
|
|
|
e65c7f |
index 7104121d..00cf0a6f 100644
|
|
|
e65c7f |
--- a/tests/test_x509_ext.py
|
|
|
e65c7f |
+++ b/tests/test_x509_ext.py
|
|
|
e65c7f |
@@ -3003,7 +3003,8 @@ class TestDistributionPoint(object):
|
|
|
e65c7f |
with pytest.raises(ValueError):
|
|
|
e65c7f |
x509.DistributionPoint("data", "notname", None, None)
|
|
|
e65c7f |
|
|
|
e65c7f |
- def test_relative_name_name_value_deprecated(self):
|
|
|
e65c7f |
+ def DISABLED_test_relative_name_name_value_deprecated(self):
|
|
|
e65c7f |
+ # pytest 2.7 does not support context manager for deprecated_call()
|
|
|
e65c7f |
with pytest.deprecated_call():
|
|
|
e65c7f |
x509.DistributionPoint(
|
|
|
e65c7f |
None,
|
|
|
e65c7f |
--
|
|
|
e65c7f |
2.13.5
|
|
|
e65c7f |
|