Skip to content

Commit

Permalink
Merge pull request #1400 from ibrahima/patch-1
Browse files Browse the repository at this point in the history
Rename 3 remaining instances of slave to worker
  • Loading branch information
cyberw authored May 28, 2020
2 parents 55a350d + d22a03f commit 6241d59
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/running-locust-docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The docker image can be used like this (assuming that the ``locustifile.py`` exi
Docker Compose
==============

Here's an example Docker Compose file that could ber used to start both a master node, and slave nodes:
Here's an example Docker Compose file that could ber used to start both a master node, and worker nodes:

.. literalinclude:: ../examples/docker-compose/docker-compose.yml
:language: yaml
Expand Down
2 changes: 1 addition & 1 deletion locust/runners.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ def heartbeat_worker(self):
client.heartbeat -= 1

def reset_connection(self):
logger.info("Reset connection to slave")
logger.info("Reset connection to worker")
try:
self.server.close()
self.server = rpc.Server(self.master_bind_host, self.master_bind_port)
Expand Down
2 changes: 1 addition & 1 deletion locust/test/test_runners.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def incr_stats(l):
# issue start command that should trigger TestUsers to be spawned in the Workers
master.start(6, hatch_rate=1000)
sleep(0.1)
# check that slave nodes have started locusts
# check that worker nodes have started locusts
for worker in workers:
self.assertEqual(2, worker.user_count)
# give time for users to generate stats, and stats to be sent to master
Expand Down

0 comments on commit 6241d59

Please sign in to comment.