diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-29 11:42:14 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-29 11:42:14 -0700 |
| commit | 22e2eaee0b48318c3a3e5eda7ce9174ac8cfce6a (patch) | |
| tree | 73bc4826dd999a710366a5d0e9f995713297903e /tests | |
| parent | 23aeea2527e5b2f26596488ee1635a9f48713e42 (diff) | |
| download | cryptography-22e2eaee0b48318c3a3e5eda7ce9174ac8cfce6a.tar.gz cryptography-22e2eaee0b48318c3a3e5eda7ce9174ac8cfce6a.tar.bz2 cryptography-22e2eaee0b48318c3a3e5eda7ce9174ac8cfce6a.zip | |
Removed helper
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_padding.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_padding.py b/tests/hazmat/primitives/test_padding.py index a41edac1..c47b6c5c 100644 --- a/tests/hazmat/primitives/test_padding.py +++ b/tests/hazmat/primitives/test_padding.py @@ -31,8 +31,10 @@ class TestPKCS7(object): def test_invalid_padding(self, size, padded): padder = padding.PKCS7(size) + unpadder = padder.unpadder() with pytest.raises(ValueError): - padder.unpad(padded) + unpadder.update(padded) + unpadder.finalize() @pytest.mark.parametrize(("size", "unpadded", "padded"), [ ( @@ -48,7 +50,10 @@ class TestPKCS7(object): ]) def test_pad(self, size, unpadded, padded): padder = padding.PKCS7(size) - assert padder.pad(unpadded) == padded + padder = padder.padder() + result = padder.update(unpadded) + result += padder.finalize() + assert result == padded @pytest.mark.parametrize(("size", "unpadded", "padded"), [ ( @@ -64,7 +69,10 @@ class TestPKCS7(object): ]) def test_unpad(self, size, unpadded, padded): padder = padding.PKCS7(size) - assert padder.unpad(padded) == unpadded + unpadder = padder.unpadder() + result = unpadder.update(padded) + result += unpadder.finalize() + assert result == unpadded def test_use_after_finalize(self): p = padding.PKCS7(128) |