From 846534785d777b7d0e9c319e7f832ff255c23d7b Mon Sep 17 00:00:00 2001 From: Amador Pahim Date: Mon, 11 Jul 2016 16:55:15 +0200 Subject: [PATCH] Yet another spellcheck. Signed-off-by: Amador Pahim --- avocado/core/multiplexer.py | 10 +++++----- avocado/core/remote/result.py | 2 +- avocado/core/test.py | 6 +++--- avocado/core/tree.py | 2 +- avocado/utils/astring.py | 2 +- avocado/utils/memory.py | 2 +- avocado/utils/script.py | 4 ++-- selftests/unit/test_tree.py | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/avocado/core/multiplexer.py b/avocado/core/multiplexer.py index 43bb5994..c823825f 100644 --- a/avocado/core/multiplexer.py +++ b/avocado/core/multiplexer.py @@ -199,11 +199,11 @@ class AvocadoParams(object): converts user-friendly asterisk path to python regexp and compiles it: path = "" => ^$ path = "/" => / - path = "/asdf/fdsa" => /asdf/fdsa - path = "asdf/fdsa" => $MUX_ENTRY/?.*/asdf/fdsa - path = "/*/asdf" => /[^/]*/asdf - path = "asdf/*" => $MUX_ENTRY/?.*/asdf/.* - path = "/asdf/*" => /asdf/.* + path = "/foo/bar" => /foo/bar + path = "foo/bar" => $MUX_ENTRY/?.*/foo/bar + path = "/*/foo" => /[^/]*/foo + path = "foo/*" => $MUX_ENTRY/?.*/foo/.* + path = "/foo/*" => /foo/.* """ if not path: return re.compile('^$') diff --git a/avocado/core/remote/result.py b/avocado/core/remote/result.py index ca6cae71..27c42d7d 100644 --- a/avocado/core/remote/result.py +++ b/avocado/core/remote/result.py @@ -1,4 +1,4 @@ -# This rogram is free software; you can redistribute it and/or modify +# This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. diff --git a/avocado/core/test.py b/avocado/core/test.py index 95df112f..1ccc42d6 100644 --- a/avocado/core/test.py +++ b/avocado/core/test.py @@ -90,9 +90,9 @@ class TestName(object): fsname = astring.string_to_safe_path(name) if len(name) == len(fsname): # everything fits in return fsname - # 001-mytest;aaa - # 001-mytest;a - # 001-myte;aaa + # 001-mytest;foo + # 001-mytest;f + # 001-myte;foo idx_fit_variant = len(fsname) - len(self.str_variant) if idx_fit_variant > len(self.str_uid): # full uid+variant return (fsname[:idx_fit_variant] + diff --git a/avocado/core/tree.py b/avocado/core/tree.py index aba0e5e9..752a1e6a 100644 --- a/avocado/core/tree.py +++ b/avocado/core/tree.py @@ -287,7 +287,7 @@ class TreeNode(object): node = None def iter_leaves(self): - """ Iterate throuh leaf nodes """ + """ Iterate through leaf nodes """ for node in self.iter_children_preorder(): if node.is_leaf: yield node diff --git a/avocado/utils/astring.py b/avocado/utils/astring.py index 916e8bea..bf4ed0c8 100644 --- a/avocado/utils/astring.py +++ b/avocado/utils/astring.py @@ -200,7 +200,7 @@ def tabular_output(matrix, header=None): def string_safe_encode(string): """ - People tend to mix unicode strems with encoded strings. This function + People tend to mix unicode streams with encoded strings. This function tries to replace any input with a valid utf-8 encoded ascii stream. """ if not isinstance(string, basestring): diff --git a/avocado/utils/memory.py b/avocado/utils/memory.py index 5515cd78..444ea886 100644 --- a/avocado/utils/memory.py +++ b/avocado/utils/memory.py @@ -220,7 +220,7 @@ def get_buddy_info(chunk_sizes, nodes="all", zones="all"): 2^chunk_size * page_size The chunk_sizes can be string make up by all orders that you want to check - splited with blank or a mathematical expression with ``>``, ``<`` or ``=``. + split with blank or a mathematical expression with ``>``, ``<`` or ``=``. For example: * The input of chunk_size could be: ``0 2 4``, and the return will be diff --git a/avocado/utils/script.py b/avocado/utils/script.py index 4c71a792..0c9987d2 100644 --- a/avocado/utils/script.py +++ b/avocado/utils/script.py @@ -136,7 +136,7 @@ def make_script(path, content, mode=DEFAULT_MODE): Creates a new script stored in the file system. :param path: the script file name. - :param contet: the script content. + :param content: the script content. :param mode: set file mode, default to 0775. :return: the script path. """ @@ -150,7 +150,7 @@ def make_temp_script(name, content, prefix='avocado_script', mode=DEFAULT_MODE): Creates a new temporary script stored in the file system. :param path: the script file name. - :param contet: the script content. + :param content: the script content. :param prefix: the directory prefix Default to 'avocado_script'. :param mode: set file mode, default to 0775. :return: the script path. diff --git a/selftests/unit/test_tree.py b/selftests/unit/test_tree.py index f41dbf0b..3d62a451 100644 --- a/selftests/unit/test_tree.py +++ b/selftests/unit/test_tree.py @@ -117,7 +117,7 @@ class TestTree(unittest.TestCase): leaves = ['intel', 'amd', 'arm', 'scsi', 'virtio', 'fedora', 'mint', 'prod'] self.assertEqual(leaves, self.tree.get_leaves()) - # asci contain all leaves and doesn't raise any exceptions + # ascii contain all leaves and doesn't raise any exceptions ascii = tree.tree_view(self.tree, 0, False) for leaf in leaves: self.assertIn(leaf, ascii, "Leaf %s not in asci:\n%s" -- GitLab