Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

choosed -> chosen #181

Merged
merged 3 commits into from
Jul 23, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/writing-a-locustfile.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ and - if we were loadtesting an auction website - could do stuff like "loading t

When a load test is started, each instance of the spawned Locust classes will start executing their
TaskSet. What happens then is that each TaskSet will pick one of it's tasks and call it. It will then
wait a number of milliseconds, choosed at random between the Locust class' *min_wait* and *max_wait* attributes
wait a number of milliseconds, chosen at random between the Locust class' *min_wait* and *max_wait* attributes
(unless min_wait/max_wait has been defined directly under the TaskSet, in which case it will use
it's own values instead). Then it will again pick a new task which will be called, then wait again,
and so on.
Expand Down Expand Up @@ -132,11 +132,11 @@ task attribute

Using the @task decorator to declare tasks is a convenience, and usually that's the best way to do
it. However, it's also possible to define the tasks of a TaskSet by setting the
:py:attr:`tasks <locust.core.TaskSet.tasks>` attribute (actually using the @task decorator will actually
:py:attr:`tasks <locust.core.TaskSet.tasks>` attribute (using the @task decorator will actually
just populate the *tasks* attribute).

The *tasks* attribute which is either a list of python callables, or a *<callable : int>* dict.
The tasks are python callables, that recieves one argument - the TaskSet class instance that is executing
The tasks are python callables that recieve one argument - the TaskSet class instance that is executing
the task. Here is an extremely simple example of a locustfile (this locsutfile won't actually load test anything)::

from locust import Locust, TaskSet
Expand Down
4 changes: 2 additions & 2 deletions examples/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class WebsiteUser(HttpLocust):
"""
We need somewhere to store the stats.

On the master node stats will contain the aggregated sum of all content-lengths,
while one the slave nodes this will be the sum of the content-lengths since the
On the master node stats will contain the aggregated sum of all content-lengths,
while on the slave nodes this will be the sum of the content-lengths since the
last stats report was sent to the master
"""
stats = {"content-length":0}
Expand Down