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

Sync with fork #1

Merged
merged 40 commits into from
Oct 27, 2019
Merged

Sync with fork #1

merged 40 commits into from
Oct 27, 2019

Conversation

ajt89
Copy link
Owner

@ajt89 ajt89 commented Oct 27, 2019

No description provided.

cyberw and others added 30 commits September 30, 2019 10:37
…s and "only async". Add test for master total stats with none response times.
…-finish-wait-time

# Conflicts:
#	locust/main.py
Should hopefully help resolve #1116
URL names (for stats) were not HTML-escaped in the dashboard.
This made names with angle brackets disappear. For example:

```
self.client.get(url, name='/some-resource/upload/<uuid>')
```

would show up as `/some-resource/upload/` instead of `/some-resource/upload/<uuid>` which is confusing.

I added new key to /stats/request - "safe_name" - so that escaping
is on the server side and javascript has less logic.
Actually cgi.escape is still available in Python3.7, but is deprecated.
So going forward, it's safer to import escape from html.

I disabled escaping quotes (quote=False) for consistency and because
it's not needed for this purpose.
…e locust object from LocustRunner.stop(),I pass the locust object to spawn() instead of the locust class.
…hat in tests to avoid random test failures due to unavailable port
Allow None response time for requests
…ing)

Added test case with use of TaskSet.interrupt(), made sure we actually terminate when that happens.
@ajt89 ajt89 merged commit 88168a3 into ajt89:master Oct 27, 2019
ajt89 pushed a commit that referenced this pull request Nov 17, 2020
ajt89 pushed a commit that referenced this pull request Sep 14, 2022
…ng-test

Added check to swarm for class picker. Uses pre selected user classes if test is already running
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants