Skip to content

Commit d4541b6

Browse files
ansanpermattsb42-aws
authored andcommitted
Migrate "test/unit/test_providers_raw_master_key_provider.py" from unittest to pytest (#124)
* Migrating unit/test_deserialize.py from unittest from pytest * Migrate unit/test_provides_kms_master_key.py from unittest to pytest * Migrated unit/test/_providers_kms_master_key_provider.py from unittest to pytest * unit/test_providers_raw_master_key.py * Migrate unit/test_providers_raw_master_key_provider.py from unittest from pytest * Removed unit tests not corresponding to this branch * Removed unused import
1 parent a52a22f commit d4541b6

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

test/unit/test_providers_raw_master_key_provider.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
# ANY KIND, either express or implied. See the License for the specific
1212
# language governing permissions and limitations under the License.
1313
"""Test suite for aws_encryption_sdk.key_providers.raw.RawMasterKeyProvider"""
14-
import unittest
15-
1614
import attr
1715
import pytest
18-
import six
1916
from mock import MagicMock, patch, sentinel
2017

2118
from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
@@ -42,16 +39,17 @@ def _get_raw_key(self, key_id):
4239
return self.config.mock_wrapping_key
4340

4441

45-
class TestRawMasterKeyProvider(unittest.TestCase):
42+
class TestRawMasterKeyProvider(object):
4643
def test_parent(self):
4744
assert issubclass(RawMasterKeyProvider, MasterKeyProvider)
4845

4946
def test_get_raw_key_enforcement(self):
5047
class TestProvider(RawMasterKeyProvider):
5148
pass
5249

53-
with six.assertRaisesRegex(self, TypeError, "Can't instantiate abstract class TestProvider *"):
50+
with pytest.raises(TypeError) as excinfo:
5451
TestProvider()
52+
excinfo.match("Can't instantiate abstract class TestProvider *")
5553

5654
@patch(
5755
"aws_encryption_sdk.key_providers.raw.RawMasterKeyConfig", return_value=sentinel.raw_master_key_config_instance

0 commit comments

Comments
 (0)