diff options
| -rw-r--r-- | test/py/tests/test_vboot.py | 12 | ||||
| -rw-r--r-- | test/py/u_boot_console_base.py | 4 | ||||
| -rw-r--r-- | test/py/u_boot_utils.py | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index 46552fc803..8d1071000c 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013, Google Inc. +# Copyright (c) 2016, Google Inc. # # SPDX-License-Identifier: GPL-2.0+ # @@ -16,7 +16,7 @@ For image verification: For configuration verification: - Corrupt signature and check for failure - Create FIT (with unsigned configuration) with mkimage -- Check that image veriication works +- Check that image verification works - Sign the FIT and mark the key as 'required' for verification - Check that image verification works - Corrupt the signature @@ -41,7 +41,7 @@ def test_vboot(u_boot_console): key-generation process is quite slow and we want to avoid doing it twice. """ def dtc(dts): - """Run the device-tree compiler to compile a .dts file + """Run the device tree compiler to compile a .dts file The output file will be the same as the input file but with a .dtb extension. @@ -73,12 +73,12 @@ def test_vboot(u_boot_console): assert(expect_string in output) def make_fit(its): - """Make a new FIT from the .its source file + """Make a new FIT from the .its source file. This runs 'mkimage -f' to create a new FIT. Args: - its: Filename containing .its source + its: Filename containing .its source. """ util.run_and_log(cons, [mkimage, '-D', dtc_args, '-f', '%s%s' % (datadir, its), fit]) @@ -94,7 +94,7 @@ def test_vboot(u_boot_console): '-r', fit]) def test_with_algo(sha): - """Test verified boot with the given hash algorithm + """Test verified boot with the given hash algorithm. This is the main part of the test code. The same procedure is followed for both hashing algorithms. diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 4606ad48bf..356cf801b4 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -223,9 +223,9 @@ class ConsoleBase(object): for each command in a list. Args: - cmd: List of commands (each a string) + cmd: List of commands (each a string). Returns: - Combined output of all commands, as a string + Combined output of all commands, as a string. """ output = '' for cmd in cmds: diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py index d71348f70e..e74e34231f 100644 --- a/test/py/u_boot_utils.py +++ b/test/py/u_boot_utils.py @@ -186,7 +186,7 @@ def cmd(u_boot_console, cmd_str): return run_and_log(u_boot_console, cmd_str.split()) def run_and_log_expect_exception(u_boot_console, cmd, retcode, msg): - """Run a command which is expected to fail. + """Run a command that is expected to fail. This runs a command and checks that it fails with the expected return code and exception method. If not, an exception is raised. @@ -195,7 +195,7 @@ def run_and_log_expect_exception(u_boot_console, cmd, retcode, msg): u_boot_console: A console connection to U-Boot. cmd: The command to run, as an array of argv[]. retcode: Expected non-zero return code from the command. - msg: String which should be contained within the command's output. + msg: String that should be contained within the command's output. """ try: runner = u_boot_console.log.get_runner(cmd[0], sys.stdout) |