2
0
mirror of https://github.com/openkmip/pykmip synced 2026-01-04 09:33:37 +00:00

Fix pending deprecation warnings caused by dependency upgrades

This change fixes various pending deprecation warnings throughout
the library caused by recent updates to different dependencies.
While PyKMIP no longer directly triggers these warnings, some
dependencies still do when run through the test suite.
This commit is contained in:
Peter Hamilton
2018-11-16 11:42:05 -05:00
parent 257fcca477
commit 9a5db6d5e1
48 changed files with 583 additions and 578 deletions

View File

@@ -56,7 +56,7 @@ class TestPolicy(testtools.TestCase):
args = (object_policy, )
regex = "'INVALID' is not a valid ObjectType value."
self.assertRaisesRegexp(
self.assertRaisesRegex(
ValueError,
regex,
policy.parse_policy,
@@ -71,7 +71,7 @@ class TestPolicy(testtools.TestCase):
args = (object_policy, )
regex = "'INVALID' is not a valid Operation value."
self.assertRaisesRegexp(
self.assertRaisesRegex(
ValueError,
regex,
policy.parse_policy,
@@ -87,7 +87,7 @@ class TestPolicy(testtools.TestCase):
args = (object_policy, )
regex = "'INVALID' is not a valid Policy value."
self.assertRaisesRegexp(
self.assertRaisesRegex(
ValueError,
regex,
policy.parse_policy,
@@ -211,7 +211,7 @@ class TestPolicy(testtools.TestCase):
args = (policy_file.name, )
regex = "Policy 'test' contains an invalid section named: invalid"
self.assertRaisesRegexp(
self.assertRaisesRegex(
ValueError,
regex,
policy.read_policy_from_file,
@@ -263,7 +263,7 @@ class TestPolicy(testtools.TestCase):
regex = "Loading the policy file '{}' generated a JSON error:".format(
policy_file.name
)
self.assertRaisesRegexp(
self.assertRaisesRegex(
ValueError,
regex,
policy.read_policy_from_file,