fix all except kms keyring / mkp tests

Author: RitvikKapila

performance_tests/test/keyrings/test_aws_kms_keyring.py

@@ -104,8 +104,6 @@ def encrypt(
     output_file: str
 ):
     """Performance test for the encrypt_using_keyring function."""
-    print('plaintext_data_filename', plaintext_data_filename)
-    print('output_file', output_file)
     plaintext_data = PerfTestUtils.read_file(plaintext_data_filename)
 
     keyring = create_keyring(kms_key_id)
@@ -190,7 +188,6 @@ def test_create_given_kms_client(runner):
 def test_encrypt(runner):
     """Test the encrypt_using_keyring function"""
     result = runner.invoke(encrypt_kms_keyring.commands['encrypt'], ['--n_iters', 1])
-    print('result.output', result.output)
     assert result.exit_code == 0
 
 

performance_tests/test/keyrings/test_raw_aes_keyring.py

@@ -26,7 +26,7 @@ def create_raw_aes_keyring():
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_keyring_create')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_keyring_create')
 def create(
     n_iters: int,
     output_file: str
@@ -52,12 +52,13 @@ def encrypt_raw_aes_keyring():
 
 @encrypt_raw_aes_keyring.command()
 @click.option('--plaintext_data_filename',
-              default='test/resources/plaintext/plaintext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/plaintext/plaintext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
               prompt='Filename containing plaintext data you want to encrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_keyring_encrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_keyring_encrypt')
 def encrypt(
     plaintext_data_filename: str,
     n_iters: int,
@@ -88,12 +89,13 @@ def decrypt_raw_aes_keyring():
 
 @decrypt_raw_aes_keyring.command()
 @click.option('--ciphertext_data_filename',
-              default='test/resources/ciphertext/raw_aes/ciphertext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/ciphertext/raw_aes/ciphertext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
               prompt='Filename containing ciphertext data you want to decrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_keyring_decrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_keyring_decrypt')
 def decrypt(
     ciphertext_data_filename: str,
     n_iters: int,

performance_tests/test/keyrings/test_raw_rsa_keyring.py

@@ -26,7 +26,7 @@ def create_raw_rsa_keyring():
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_keyring_create')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_keyring_create')
 def create(
     n_iters: int,
     output_file: str
@@ -55,12 +55,13 @@ def encrypt_raw_rsa_keyring():
 
 @encrypt_raw_rsa_keyring.command()
 @click.option('--plaintext_data_filename',
-              default='test/resources/plaintext/plaintext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/plaintext/plaintext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
               prompt='Filename containing plaintext data you want to encrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_keyring_encrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_keyring_encrypt')
 def encrypt(
     plaintext_data_filename: str,
     n_iters: int,
@@ -93,12 +94,13 @@ def decrypt_raw_rsa_keyring():
 
 @decrypt_raw_rsa_keyring.command()
 @click.option('--ciphertext_data_filename',
-              default='test/resources/ciphertext/raw_rsa/ciphertext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/ciphertext/raw_rsa/ciphertext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
               prompt='Filename containing ciphertext data you want to decrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_keyring_decrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_keyring_decrypt')
 def decrypt(
     ciphertext_data_filename: str,
     n_iters: int,

performance_tests/test/master_key_providers/test_aws_kms_master_key_provider.py

@@ -28,7 +28,7 @@ def create_kms_key_provider():
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='kms_key_provider_create')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/kms_key_provider_create')
 def create(
     kms_key_id: str,
     n_iters: int,
@@ -55,14 +55,15 @@ def encrypt_kms_key_provider():
 
 @encrypt_kms_key_provider.command()
 @click.option('--plaintext_data_filename',
-              default='test/resources/plaintext/plaintext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/plaintext/plaintext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
               prompt='Filename containing plaintext data you want to encrypt')
 @click.option('--kms_key_id',
               default='arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='kms_key_provider_encrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/kms_key_provider_encrypt')
 def encrypt(
     plaintext_data_filename: str,
     kms_key_id: str,
@@ -94,14 +95,15 @@ def decrypt_kms_key_provider():
 
 @decrypt_kms_key_provider.command()
 @click.option('--ciphertext_data_filename',
-              default='test/resources/ciphertext/kms/ciphertext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/ciphertext/kms/ciphertext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
               prompt='Filename containing ciphertext data you want to decrypt')
 @click.option('--kms_key_id',
               default='arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='kms_key_provider_decrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/kms_key_provider_decrypt')
 def decrypt(
     ciphertext_data_filename: str,
     kms_key_id: str,

performance_tests/test/master_key_providers/test_raw_aes_master_key_provider.py

@@ -26,7 +26,7 @@ def create_raw_aes_key_provider():
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_key_provider_create')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_key_provider_create')
 def create(
     n_iters: int,
     output_file: str
@@ -52,12 +52,13 @@ def encrypt_raw_aes_key_provider():
 
 @encrypt_raw_aes_key_provider.command()
 @click.option('--plaintext_data_filename',
-              default='test/resources/plaintext/plaintext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/plaintext/plaintext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
               prompt='Filename containing plaintext data you want to encrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_key_provider_encrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_key_provider_encrypt')
 def encrypt(
     plaintext_data_filename: str,
     n_iters: int,
@@ -88,12 +89,13 @@ def decrypt_raw_aes_key_provider():
 
 @decrypt_raw_aes_key_provider.command()
 @click.option('--ciphertext_data_filename',
-              default='test/resources/ciphertext/raw_aes/ciphertext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/ciphertext/raw_aes/ciphertext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
               prompt='Filename containing ciphertext data you want to decrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_aes_key_provider_decrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_aes_key_provider_decrypt')
 def decrypt(
     ciphertext_data_filename: str,
     n_iters: int,

performance_tests/test/master_key_providers/test_raw_rsa_master_key_provider.py

@@ -26,7 +26,7 @@ def create_raw_rsa_key_provider():
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_key_provider_create')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_key_provider_create')
 def create(
     n_iters: int,
     output_file: str
@@ -52,12 +52,13 @@ def encrypt_raw_rsa_key_provider():
 
 @encrypt_raw_rsa_key_provider.command()
 @click.option('--plaintext_data_filename',
-              default='test/resources/plaintext/plaintext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/plaintext/plaintext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.dat',
               prompt='Filename containing plaintext data you want to encrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_key_provider_encrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_key_provider_encrypt')
 def encrypt(
     plaintext_data_filename: str,
     n_iters: int,
@@ -88,12 +89,13 @@ def decrypt_raw_rsa_key_provider():
 
 @decrypt_raw_rsa_key_provider.command()
 @click.option('--ciphertext_data_filename',
-              default='test/resources/ciphertext/raw_rsa/ciphertext-data-' + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
+              default='/'.join(__file__.split("/")[:-2]) + '/resources/ciphertext/raw_rsa/ciphertext-data-'
+              + PerfTestUtils.DEFAULT_FILE_SIZE + '.ct',
               prompt='Filename containing ciphertext data you want to decrypt')
 @click.option('--n_iters',
               default=PerfTestUtils.DEFAULT_N_ITERS)
 @click.option('--output_file',
-              default='raw_rsa_key_provider_decrypt')
+              default='/'.join(__file__.split("/")[:-3]) + '/results/raw_rsa_key_provider_decrypt')
 def decrypt(
     ciphertext_data_filename: str,
     n_iters: int,

performance_tests/tox.ini

@@ -31,7 +31,7 @@ envlist =
 # release :: Builds dist files and uploads to pypi pypirc profile.
 
 [testenv:base-command]
-commands = pytest -s -v test/
+commands = pytest test/
 deps = 
     click