Browse Source

Merge "migrate tox based testing to ubuntu focal"

changes/78/751878/2
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
04ded0e990
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      barbican/plugin/dogtag.py
  2. +1
    -0
      test-requirements.txt

+ 1
- 1
barbican/plugin/dogtag.py View File

@@ -666,7 +666,7 @@ def _catch_subca_deletion_exceptions(ca_related_function):
def _catch_subca_exception(self, *args, **kwargs):
try:
return ca_related_function(self, *args, **kwargs)
except pki.ResourceNotFoundException as e:
except pki.ResourceNotFoundException:
LOG.warning("Sub-CA already deleted")
pass
except pki.PKIException as e:


+ 1
- 0
test-requirements.txt View File

@@ -4,6 +4,7 @@

# hacking should appear first in case something else depends on pep8
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
pyflakes>=2.1.1

coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT


Loading…
Cancel
Save