Merged gevent/zmq updates, ported to requests >= 1.2 #86
Conversation
- if available - prefer it to the deprecated gevent_zeromq
Make fail percent be failures/(success+failures). If you have 1 success and 4 failures, your fail percentage is 80%, not 400%.
* rory-fix-failure-percent: Fix failure percent calculations.
* whitmo-gevent-update: - noops - server shutdown more link_exception noops for slaves gardening - remove carriage returns - add coverage to gitignore add a setup.cfg to get automatic coverage update tests to work with nose use zmq.green - if available - prefer it to the deprecated gevent_zeromq
Based on https://github.com/sanga/locust/tree/requests_1_2 Ported locust to requests 1.2, all tests run properly.
This reverts commit 8731ff7. Conflicts: locust/clients.py locust/rpc/zmqrpc.py locust/runners.py locust/test/test_average.py
This reverts commit b217420. Conflicts: locust/__init__.py locust/clients.py locust/main.py locust/rpc/socketrpc.py locust/rpc/zmqrpc.py locust/runners.py locust/test/runtests.py locust/test/test_average.py locust/test/test_client.py locust/test/test_locust_class.py locust/test/test_stats.py setup.py
|
The travis failure is not related to the code :-( |
|
Thanks! I'll try to merge this later (minus the whitespace changes, to not obscure the GIT history). If you update the requests version in requirements.txt as well, I think the Travis CI tests will run. |
|
Thanks, I updated the requirements file. Why do we have multiple On Mon, Aug 12, 2013 at 2:13 PM, Jonatan Heyman [email protected]:
|
|
Yeah, we could probably remove the requirements.txt actually, and update the travis.yml accordingly. |
We do have a proper setuptools setup and don't need the requirements files anymore.
|
@heyman just did this step already :-) |
|
Hi! I thought I could start a new pull request from the no whitespace diff you linked to, but that doesn't seem to be possible. I'd much rather merge the 274 line changes without all the whitespace changes, rather than the 2440 line changes. Could you do a pull request with just the changes that is seen in in https://github.com/EnTeQuAk/locust/compare/locust_0_7_changes?expand=1&w=1 instead? Would be awesome :)! |
|
Okay, working on that. Sorry!
|
|
Follow up in #87 :-) |
For a clean diff ignore whitespaces: https://github.com/EnTeQuAk/locust/compare/locust_0_7_changes?expand=1&w=1
I reverted the big whitespace changes but left "usual stuff" that were in all the commits where I actually touched the code. Hope this is fine enough.
Cheers,
Chris