Skip to content

Commit

Permalink
Fix ignore prefix (#16)
Browse files Browse the repository at this point in the history
* pass ignore prefix through (#12)

* Change version and name for releasing my own package

* Update MANIFEST.in

* pass ignore prefix through

* Update package info and ignore pslocust egg files

* accidental is_locust instead of is_tasket

* Merge locustio (#14)

* Update third-party-tools.rst

Added Java Locust Swarm client

* Update third-party-tools.rst

Categorized clients by their programming languages

* Update third-party-tools.rst

* Update all pypi.python.org URLs to pypi.org (locustio#818)

* Fix some typos in events.py (locustio#820)

* Update main.py
  • Loading branch information
ps-george authored Jun 28, 2018
1 parent b8d8ab1 commit e985dc5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![Build Status](https://img.shields.io/travis/locustio/locust.svg)](https://travis-ci.org/locustio/locust)
[![codecov](https://codecov.io/gh/locustio/locust/branch/master/graph/badge.svg)](https://codecov.io/gh/locustio/locust)
[![license](https://img.shields.io/github/license/locustio/locust.svg)](https://github.com/locustio/locust/blob/master/LICENSE)
[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.python.org/pypi/locustio)
[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.python.org/pypi/locustio)
[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.org/project/locustio/)
[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.org/project/locustio/)
[![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)

## Links
Expand Down
10 changes: 6 additions & 4 deletions docs/third-party-tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ supported by many languages. So, you can write your Locust tasks in any language
libraries do the job as a slave runner. They run your Locust tasks, and report to master regularly.


Boomer (Golang)
Golang
---------------

`Boomer <https://github.com/myzhan/boomer/>`_ is a Locust slave runner written in golang.
- `Boomer <https://github.com/myzhan/boomer/>`_

Locust4j (Java)
Java
---------------

`Locust4j <https://github.com/myzhan/locust4j>`_ is a Locust slave runner written in Java.
- `Locust4j <https://github.com/myzhan/locust4j>`_

- `Swarm <https://github.com/anhldbk/swarm>`_
4 changes: 2 additions & 2 deletions locust/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ def fire(self, reverse=False, **kwargs):
"""
*master_start_hatching* is fired when we initiate the hatching process on the master.
This event is especially usefull to detect when the 'start' button is clicked on the web ui.
This event is especially useful to detect when the 'start' button is clicked on the web ui.
"""

master_stop_hatching = EventHook()
"""
*master_stop_hatching* is fired when terminate the hatching process on the master.
This event is especially usefull to detect when the 'stop' button is clicked on the web ui.
This event is especially useful to detect when the 'stop' button is clicked on the web ui.
"""

locust_start_hatching = EventHook()
Expand Down
2 changes: 1 addition & 1 deletion locust/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def load_tasksetfile(path, ignore_prefix='_'):
dictionary of ``{'name': callable}`` containing all callables which pass
the "is a TaskSet" test (`is_taskset`).
"""
return load_filterfile(path, lambda tup: is_locust(tup, ignore_prefix=ignore_prefix))
return load_filterfile(path, lambda tup: is_taskset(tup, ignore_prefix=ignore_prefix))


def run_locust(options, arguments=[], cli_mode=False):
Expand Down

0 comments on commit e985dc5

Please sign in to comment.