From dad9bfda3c427c147715de1169b9b50f8ad06749 Mon Sep 17 00:00:00 2001 From: Russell Horton Date: Tue, 22 Jul 2014 14:50:08 -0700 Subject: [PATCH 1/3] choosed -> chosen --- docs/writing-a-locustfile.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/writing-a-locustfile.rst b/docs/writing-a-locustfile.rst index a703499d07..b4ae0a60cd 100644 --- a/docs/writing-a-locustfile.rst +++ b/docs/writing-a-locustfile.rst @@ -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. From eab54e83151ae189d4da3aba9b6dc67debd6056a Mon Sep 17 00:00:00 2001 From: Russell Horton Date: Tue, 22 Jul 2014 15:39:44 -0700 Subject: [PATCH 2/3] minor typos --- docs/writing-a-locustfile.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/writing-a-locustfile.rst b/docs/writing-a-locustfile.rst index b4ae0a60cd..840cc93bc0 100644 --- a/docs/writing-a-locustfile.rst +++ b/docs/writing-a-locustfile.rst @@ -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 ` attribute (actually using the @task decorator will actually +:py:attr:`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 ** 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 From 17afba903aaf9215f3c99568036693a26b3d8b46 Mon Sep 17 00:00:00 2001 From: Russell Horton Date: Tue, 22 Jul 2014 15:40:16 -0700 Subject: [PATCH 3/3] typos --- examples/events.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/events.py b/examples/events.py index 7420c258d3..be388d0c0d 100644 --- a/examples/events.py +++ b/examples/events.py @@ -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}