From d10c1d977205dd5a2f1b227cb943b393a3a4184f Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 23 Dec 2019 07:52:24 +0300
Subject: test: pylint/pep8 fixes

---
 test/nist.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'test/nist.py')

diff --git a/test/nist.py b/test/nist.py
index f7a119f..9448a6d 100644
--- a/test/nist.py
+++ b/test/nist.py
@@ -140,25 +140,31 @@ _TEST_CIPHERTEXTS = {
     }
 }
 
+
 def get_test_plaintexts(*_):
     return _TEST_PLAINTEXTS
 
+
 def get_test_key(algorithm, *_):
     return _TEST_KEYS[algorithm]
 
+
 def get_test_iv(algorithm, mode):
     if not mode.requires_init_vector():
         return None
     return _TEST_INIT_VECTORS[algorithm][mode]
 
+
 def get_test_ciphertexts(algorithm, mode):
     return _TEST_CIPHERTEXTS[algorithm][mode]
 
+
 def get_tested_algorithms_and_modes():
     for algorithm in _TEST_CIPHERTEXTS:
         for mode in _TEST_CIPHERTEXTS[algorithm]:
             yield algorithm, mode
 
+
 def verify_test_output(actual, expected):
     if len(actual) != len(expected):
         logging.error('Unexpected output length!')
@@ -170,9 +176,11 @@ def verify_test_output(actual, expected):
         return False
     return True
 
+
 class TestExitCode(Enum):
     SUCCESS, FAILURE, ERROR, SKIPPED = range(1, 5)
 
+
 def run_encryption_test(tools, algorithm, mode, use_boxes=False):
     logging.info('Running encryption test...')
     logging.info('Algorithm: %s', algorithm)
@@ -188,13 +196,13 @@ def run_encryption_test(tools, algorithm, mode, use_boxes=False):
             algorithm, mode, input_, use_boxes)
         if verify_test_output(actual_ciphertexts, expected_ciphertexts):
             return TestExitCode.SUCCESS
-        else:
-            return TestExitCode.FAILURE
+        return TestExitCode.FAILURE
     except CalledProcessError as e:
         logging.error('Encountered an exception!')
         logging.exception(e)
         return TestExitCode.ERROR
 
+
 def run_decryption_test(tools, algorithm, mode, use_boxes=False):
     logging.info('Running decryption test...')
     logging.info('Algorithm: %s', algorithm)
@@ -210,21 +218,23 @@ def run_decryption_test(tools, algorithm, mode, use_boxes=False):
             algorithm, mode, input_, use_boxes)
         if verify_test_output(actual_plaintexts, expected_plaintexts):
             return TestExitCode.SUCCESS
-        else:
-            return TestExitCode.FAILURE
+        return TestExitCode.FAILURE
     except CalledProcessError as e:
         logging.error('Encountered an exception!')
         logging.exception(e)
         return TestExitCode.ERROR
 
+
 _script_dir = os.path.dirname(__file__)
 _script_name = os.path.splitext(os.path.basename(__file__))[0]
 
+
 def _build_default_log_path():
     timestamp = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
     fn = '{}_{}.log'.format(_script_name, timestamp)
     return os.path.join(_script_dir, fn)
 
+
 def _setup_logging(log_path=None):
     if log_path is None:
         log_path = _build_default_log_path()
@@ -234,6 +244,7 @@ def _setup_logging(log_path=None):
         format='%(asctime)s | %(module)s | %(levelname)s | %(message)s',
         level=logging.DEBUG)
 
+
 def run_tests(tools_path=(), use_sde=False, use_boxes=False, log_path=None):
     _setup_logging(log_path)
     tools = Tools(tools_path, use_sde=use_sde)
@@ -257,6 +268,7 @@ def run_tests(tools_path=(), use_sde=False, use_boxes=False, log_path=None):
     else:
         return 1
 
+
 def _parse_args(args=None):
     if args is None:
         args = sys.argv[1:]
@@ -272,8 +284,10 @@ def _parse_args(args=None):
                         help='set log file path')
     return parser.parse_args(args)
 
+
 def main(args=None):
     return run_tests(**vars(_parse_args(args)))
 
+
 if __name__ == '__main__':
     sys.exit(main())
-- 
cgit v1.2.3