Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit214c0f9

Browse files
saifelsesybrenstuvel
authored andcommitted
Clean up stdout when using unittest test runner
While pytest is the preferred test runner via tox, it looks like some folks arestill running tests via `python3 setup.py test` which uses unittest and doesnot have good support for capturing stdout. To make using unittest slightlymore friendly, we further swallow stdout / stderr for cli tests, and ensureprint statements start on a newline.
1 parent4c3cd57 commit214c0f9

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎tests/test_cli.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def assertExits(self, status_code, func, *args, **kwargs):
113113

114114
classKeygenTest(AbstractCliTest):
115115
deftest_keygen_no_args(self):
116-
withcli_args():
116+
withcaptured_output(),cli_args():
117117
self.assertExits(1,rsa.cli.keygen)
118118

119119
deftest_keygen_priv_stdout(self):
@@ -182,11 +182,11 @@ def test_keygen_pub_out_pem(self):
182182

183183
classEncryptDecryptTest(AbstractCliTest):
184184
deftest_empty_decrypt(self):
185-
withcli_args():
185+
withcaptured_output(),cli_args():
186186
self.assertExits(1,rsa.cli.decrypt)
187187

188188
deftest_empty_encrypt(self):
189-
withcli_args():
189+
withcaptured_output(),cli_args():
190190
self.assertExits(1,rsa.cli.encrypt)
191191

192192
@cleanup_files('encrypted.txt','cleartext.txt')
@@ -227,11 +227,11 @@ def test_encrypt_decrypt_unhappy(self):
227227

228228
classSignVerifyTest(AbstractCliTest):
229229
deftest_empty_verify(self):
230-
withcli_args():
230+
withcaptured_output(),cli_args():
231231
self.assertExits(1,rsa.cli.verify)
232232

233233
deftest_empty_sign(self):
234-
withcli_args():
234+
withcaptured_output(),cli_args():
235235
self.assertExits(1,rsa.cli.sign)
236236

237237
@cleanup_files('signature.txt','cleartext.txt')

‎tests/test_integers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def setUp(self):
2626

2727
deftest_enc_dec(self):
2828
message=42
29-
print("\tMessage: %d"%message)
29+
print("\n\tMessage: %d"%message)
3030

3131
encrypted=rsa.core.encrypt_int(message,self.pub.e,self.pub.n)
3232
print("\tEncrypted: %d"%encrypted)
@@ -40,7 +40,7 @@ def test_sign_verify(self):
4040
message=42
4141

4242
signed=rsa.core.encrypt_int(message,self.priv.d,self.pub.n)
43-
print("\tSigned: %d"%signed)
43+
print("\n\tSigned: %d"%signed)
4444

4545
verified=rsa.core.decrypt_int(signed,self.pub.e,self.pub.n)
4646
print("\tVerified: %d"%verified)

‎tests/test_pkcs1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def setUp(self):
2929

3030
deftest_enc_dec(self):
3131
message=struct.pack('>IIII',0,0,0,1)
32-
print("\tMessage: %r"%message)
32+
print("\n\tMessage: %r"%message)
3333

3434
encrypted=pkcs1.encrypt(message,self.pub)
3535
print("\tEncrypted: %r"%encrypted)

‎tests/test_strings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def setUp(self):
2929

3030
deftest_enc_dec(self):
3131
message=unicode_string.encode('utf-8')
32-
print("\tMessage: %r"%message)
32+
print("\n\tMessage: %r"%message)
3333

3434
encrypted=rsa.encrypt(message,self.pub)
3535
print("\tEncrypted: %r"%encrypted)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp