summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 07:17:50 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 07:17:50 +0000
commit2983962fb70cbe78b3ef4901fd1e61d63f9e8e22 (patch)
tree2c9b0a230da1f8ef5e86005da63fa5f29352de3e
parent92d391fffc83e56f59b5d92659fcc7a40ee36cdb (diff)
parentcf3a867872cae5caaf7104476cf948c6abedb67f (diff)
downloadtrove-2983962fb70cbe78b3ef4901fd1e61d63f9e8e22.tar.gz
Merge "Fix a few typos"
-rw-r--r--trove/common/utils.py2
-rw-r--r--trove/tests/util/event_simulator.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/trove/common/utils.py b/trove/common/utils.py
index 774cfc66..0cf2f90e 100644
--- a/trove/common/utils.py
+++ b/trove/common/utils.py
@@ -118,7 +118,7 @@ class cached_property(object):
Taken from : https://github.com/nshah/python-memoize
The function wrapped is called the first time to retrieve the result
- and than that calculated result is used the next time you access
+ and then that calculated result is used the next time you access
the value:
class Foo(object):
diff --git a/trove/tests/util/event_simulator.py b/trove/tests/util/event_simulator.py
index 0458b51a..d21254de 100644
--- a/trove/tests/util/event_simulator.py
+++ b/trove/tests/util/event_simulator.py
@@ -29,12 +29,12 @@ Event Simulator Overview
========================
We use this to simulate all the threads of Trove running.
-i.e (api,taskmanager,probocsis tests) All the services end
+i.e. (api,taskmanager,proboscis tests). All the services end
up sleeping and having to wait for something to happen at times.
Monkey Patching Methods
-----------------------
-We monkey patch a few method to make this happen.
+We monkey patch a few methods to make this happen.
A few sleep methods with a fake_sleep.
* time.sleep