[Piglit] [PATCH 3/8] framework: Fix spelling mistakes
Eric Engestrom
eric at engestrom.ch
Sun Apr 3 18:21:27 UTC 2016
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
---
framework/backends/__init__.py | 4 ++--
framework/backends/abstract.py | 2 +-
framework/backends/json.py | 12 ++++++------
framework/core.py | 2 +-
framework/dmesg.py | 2 +-
framework/exceptions.py | 2 +-
framework/grouptools.py | 2 +-
framework/profile.py | 2 +-
framework/programs/run.py | 4 ++--
framework/programs/summary.py | 6 +++---
framework/status.py | 4 ++--
framework/summary/common.py | 2 +-
framework/test/base.py | 2 +-
framework/test/glsl_parser_test.py | 2 +-
framework/test/opengl.py | 2 +-
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/framework/backends/__init__.py b/framework/backends/__init__.py
index 7821375..488ad55 100644
--- a/framework/backends/__init__.py
+++ b/framework/backends/__init__.py
@@ -28,7 +28,7 @@
object and receives one.
Most consumers will want to import framework.backends and work directly with
-the helper functions here. For some more detailed uses (test cases expecially)
+the helper functions here. For some more detailed uses (test cases especially)
the modules themselves may be used.
When this module is loaded it will search through framework/backends for python
@@ -99,7 +99,7 @@ def get_backend(backend):
is the responsibility of the caller to handle this error.
If the backend module exists, but there is not active implementation then a
- BackendNotImplementedError will be raised, it is also the responsiblity of
+ BackendNotImplementedError will be raised, it is also the responsibility of
the caller to handle this error.
"""
diff --git a/framework/backends/abstract.py b/framework/backends/abstract.py
index b5b4858..13a7b67 100644
--- a/framework/backends/abstract.py
+++ b/framework/backends/abstract.py
@@ -141,7 +141,7 @@ def write_test(self, name):
Should be a context manager, used with the with statement. It should
first write an incomplete status value, then yield and object that will
overwrite that value with the final value. That object needs to take a
- 'data' paramter whic is a result.TestResult object.
+ 'data' parameter which is a result.TestResult object.
Arguments:
name -- the name of the test to be written
diff --git a/framework/backends/json.py b/framework/backends/json.py
index 1219099..2bcedab 100644
--- a/framework/backends/json.py
+++ b/framework/backends/json.py
@@ -234,7 +234,7 @@ def _load(results_file):
except ValueError as e:
raise exceptions.PiglitFatalError(
'While loading json results file: "{}",\n'
- 'the following error occured:\n{}'.format(results_file.name,
+ 'the following error occurred:\n{}'.format(results_file.name,
str(e)))
if isinstance(result, results.TestrunResult):
@@ -338,7 +338,7 @@ def _update_zero_to_one(result):
- dmesg is sometimes stored as a list, sometimes stored as a string. In
version 1 it is always stored as a string
- - in version 0 subtests are somtimes stored as duplicates, sometimes stored
+ - in version 0 subtests are sometimes stored as duplicates, sometimes stored
only with a single entry, in version 1 tests with subtests are only
recorded once, always.
- Version 0 can have an info entry, or returncode, out, and err entries,
@@ -364,7 +364,7 @@ def _update_zero_to_one(result):
# have a returncode, out, or attribute we'll want to get those out of
# info first
#
- # This expects that the order of info is rougly returncode, errors,
+ # This expects that the order of info is roughly returncode, errors,
# output, *extra it can handle having extra information in the middle,
if (None in [test.get('out'), test.get('err'),
test.get('returncode')] and test.get('info')):
@@ -381,7 +381,7 @@ def _update_zero_to_one(result):
if test.get('returncode') is None:
# In some cases the returncode might not be set (like the test
# skipped), in that case it will be None, so set it
- # apropriately
+ # appropriately
try:
test['returncode'] = int(
returncode[len('returncode: '):].strip())
@@ -406,8 +406,8 @@ def _update_zero_to_one(result):
if test.get('subtest'):
for sub in six.iterkeys(test['subtest']):
# adding the leading / ensures that we get exactly what we
- # expect, since endswith does a character by chacter match, if
- # the subtest name is duplicated it wont match, and if there
+ # expect, since endswith does a character by character match, if
+ # the subtest name is duplicated it won't match, and if there
# are more trailing characters it will not match
#
# We expect duplicate names like this:
diff --git a/framework/core.py b/framework/core.py
index 3906b58..fe4e4a4 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -191,7 +191,7 @@ def parse_listfile(filename):
class lazy_property(object): # pylint: disable=invalid-name,too-few-public-methods
"""Descriptor that replaces the function it wraps with the value generated.
- This makes a property that is truely lazy, it is calculated once on demand,
+ This makes a property that is truly lazy, it is calculated once on demand,
and stored. This makes this very useful for values that you might want to
calculate and reuse, but they cannot change.
diff --git a/framework/dmesg.py b/framework/dmesg.py
index 3cc64ce..7761375 100644
--- a/framework/dmesg.py
+++ b/framework/dmesg.py
@@ -69,7 +69,7 @@ class BaseDmesg(object):
override, as this method is used to to actually read the dmesg ringbuffer,
and the command used, and the options given are OS dependent.
- This class is not thread safe, becasue it does not black between the start
+ This class is not thread safe, because it does not black between the start
of the test and the reading of dmesg, which means that if two tests run at
the same time, and test A creates an entri in dmesg, but test B finishes
first, test B will be marked as having the dmesg error.
diff --git a/framework/exceptions.py b/framework/exceptions.py
index 6e87bee..9da360b 100644
--- a/framework/exceptions.py
+++ b/framework/exceptions.py
@@ -76,7 +76,7 @@ class PiglitInternalError(Exception):
"""
def __str__(self):
- return u'An internal error occured:\n{}'.format(
+ return u'An internal error occurred:\n{}'.format(
super(PiglitInternalError, self).__str__())
diff --git a/framework/grouptools.py b/framework/grouptools.py
index c3761c7..241cf24 100644
--- a/framework/grouptools.py
+++ b/framework/grouptools.py
@@ -21,7 +21,7 @@
"""Module providing utility functions to work with piglit groups.
Instead of using posixpath (or the generic os.path) for working with tests this
-module should be prefered.
+module should be preferred.
Piglit groups look much like posix paths, they are '/' delimited with each
element representing a group, and the final element being the test name. Unlike
diff --git a/framework/profile.py b/framework/profile.py
index fc38c56..ef1c993 100644
--- a/framework/profile.py
+++ b/framework/profile.py
@@ -104,7 +104,7 @@ def __setitem__(self, key, value):
error = "and both tests are the same."
raise exceptions.PiglitFatalError(
- "A test has already been asigned the name: {}\n{}".format(
+ "A test has already been assigned the name: {}\n{}".format(
key, error))
super(TestDict, self).__setitem__(key, value)
diff --git a/framework/programs/run.py b/framework/programs/run.py
index 581b350..be40b97 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -222,7 +222,7 @@ def run(input_):
args = _run_parser(input_)
_disable_windows_exception_messages()
- # If dmesg is requested we must have serial run, this is becasue dmesg
+ # If dmesg is requested we must have serial run, this is because dmesg
# isn't reliable with threaded run
if args.dmesg:
args.concurrency = "none"
@@ -345,7 +345,7 @@ def resume(input_):
if options.OPTIONS.dmesg:
profile.dmesg = options.OPTIONS.dmesg
- # This is resumed, don't bother with time since it wont be accurate anyway
+ # This is resumed, don't bother with time since it won't be accurate anyway
profile.run(results.options['log_level'], backend)
backend.finalize()
diff --git a/framework/programs/summary.py b/framework/programs/summary.py
index 3a00ffd..b42675f 100644
--- a/framework/programs/summary.py
+++ b/framework/programs/summary.py
@@ -60,7 +60,7 @@ def html(input_):
help="Overwrite existing directories")
parser.add_argument("-l", "--list",
action="store",
- help="Load a newline seperated list of results. These "
+ help="Load a newline separated list of results. These "
"results will be prepended to any Results "
"specified on the command line")
parser.add_argument("-e", "--exclude-details",
@@ -145,7 +145,7 @@ def console(input_):
parser.add_argument("results",
metavar="<Results Path(s)>",
nargs="+",
- help="Space seperated paths to at least one results "
+ help="Space separated paths to at least one results "
"file")
args = parser.parse_args(unparsed)
@@ -227,7 +227,7 @@ def aggregate(input_):
try:
# FIXME: This works, it fixes the problem, but it only works because
- # only the json backend has the ability to agregate results at the
+ # only the json backend has the ability to aggregate results at the
# moment.
backends.json._write(results, outfile)
except IOError as e:
diff --git a/framework/status.py b/framework/status.py
index 6a1b85e..c01adaf 100644
--- a/framework/status.py
+++ b/framework/status.py
@@ -45,7 +45,7 @@
incomplete
SKIP and NOTRUN are not factored into regressions and fixes, they are counted
-seperately. They also derive from a sublcass of Status, which always returns
+separately. They also derive from a sublcass of Status, which always returns
False
The formula for determining regressions is:
@@ -104,7 +104,7 @@ class StatusException(exceptions.PiglitInternalError):
The primary reason to have a special exception is that otherwise
status_lookup returns a KeyError, but there are many cases where it is
- desireable to except a KeyError and have an exception path. Using a custom
+ desirable to except a KeyError and have an exception path. Using a custom
Error class here allows for more fine-grained control.
"""
diff --git a/framework/summary/common.py b/framework/summary/common.py
index 364f3e0..8c7e2c7 100644
--- a/framework/summary/common.py
+++ b/framework/summary/common.py
@@ -230,7 +230,7 @@ def all_skips(self):
class Counts(object):
- """Number of tests in each catagory."""
+ """Number of tests in each category."""
def __init__(self, tests):
self.__names = tests.names
diff --git a/framework/test/base.py b/framework/test/base.py
index 0fe0f74..a5cac7a 100644
--- a/framework/test/base.py
+++ b/framework/test/base.py
@@ -156,7 +156,7 @@ class Test(object):
and properties that can be overwritten to produce a specialized class for
running test suites other than piglit.
- It provides two methods for running tests, excecute and run.
+ It provides two methods for running tests, execute and run.
execute() provides lots of features, and is invoced when running piglit
from the command line, run() is a more basic method for running the test,
and is called internally by execute(), but is can be useful outside of it.
diff --git a/framework/test/glsl_parser_test.py b/framework/test/glsl_parser_test.py
index ce043a7..3eb9188 100644
--- a/framework/test/glsl_parser_test.py
+++ b/framework/test/glsl_parser_test.py
@@ -78,7 +78,7 @@ class GLSLParserTest(FastSkipMixin, PiglitBaseTest):
Specifically it is necessary to parse a glsl_parser_test to get information
about it before actually creating a PiglitTest. Even though this could
- be done with a funciton wrapper, making it a distinct class makes it easier
+ be done with a function wrapper, making it a distinct class makes it easier
to sort in the profile.
Arguments:
diff --git a/framework/test/opengl.py b/framework/test/opengl.py
index 553ed1d..000bd84 100644
--- a/framework/test/opengl.py
+++ b/framework/test/opengl.py
@@ -167,7 +167,7 @@ def gl_version(self):
"""Calculate the maximum opengl version.
This will try (in order): core, compat, and finally no profile,
- stopping when it finds a profile. It assumes taht most implementations
+ stopping when it finds a profile. It assumes that most implementations
will have core and compat as equals, or core as superior to compat in
terms of support.
--
2.8.0
More information about the Piglit
mailing list