Merge "migrate tox based testing to ubuntu focal"
This commit is contained in:
commit
04ded0e990
|
@ -666,7 +666,7 @@ def _catch_subca_deletion_exceptions(ca_related_function):
|
||||||
def _catch_subca_exception(self, *args, **kwargs):
|
def _catch_subca_exception(self, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
return ca_related_function(self, *args, **kwargs)
|
return ca_related_function(self, *args, **kwargs)
|
||||||
except pki.ResourceNotFoundException as e:
|
except pki.ResourceNotFoundException:
|
||||||
LOG.warning("Sub-CA already deleted")
|
LOG.warning("Sub-CA already deleted")
|
||||||
pass
|
pass
|
||||||
except pki.PKIException as e:
|
except pki.PKIException as e:
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
# hacking should appear first in case something else depends on pep8
|
# hacking should appear first in case something else depends on pep8
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
|
pyflakes>=2.1.1
|
||||||
|
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
ddt>=1.0.1 # MIT
|
ddt>=1.0.1 # MIT
|
||||||
|
|
Loading…
Reference in New Issue