Rename locust to user #1314

anuj-ssharma · 2020-04-06T04:54:54Z

codecov · 2020-04-06T05:07:24Z

Codecov Report

Merging #1314 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1314   +/-   ##
=======================================
  Coverage   80.67%   80.67%           
=======================================
  Files          24       24           
  Lines        2251     2251           
  Branches      345      345           
=======================================
  Hits         1816     1816           
  Misses        343      343           
  Partials       92       92

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5aca141...5aca141. Read the comment docs.

cyberw · 2020-04-06T07:14:18Z

Thanks! But there are lots of places where "User" are still called "Locust", so there is more work to be done.

Can you introduce a hidden parameter -c/--client that throws an error? Thanks!

We should also discuss whether things like LocustRunner should be renamed UserRunner? I'm in favour of that.

heyman · 2020-04-06T09:41:09Z

We should also discuss whether things like LocustRunner should be renamed UserRunner? I'm in favour of that.

Hmm, maybe just Runner ( andLocalRunner, MasterRunner and WorkerRunner)?

locust/core.py

…_to_user

cyberw · 2020-04-09T10:47:03Z

@anuj-ssharma Any chance you'll have time to look at the suggested changes & fix the conflicts soon? It would be great to be able to release 1.0 soon!

cyberw · 2020-04-06T07:09:56Z

locust/test/test_locust_class.py

@@ -90,7 +90,7 @@ def t2(self):
        self.assertEqual(3, len([t for t in l.tasks if t.__name__ == MyLocust.t2.__name__]))

    def test_tasks_on_abstract_locust(self):
-        class AbstractLocust(Locust):
+        class AbstractLocust(User):


AbstractUser maybe?

cyberw · 2020-04-06T07:10:16Z

locust/test/test_locust_class.py

@@ -391,7 +391,7 @@ def on_start(self):
                else:
                    self.interrupt(reschedule=False)

-        class MyLocust(Locust):
+        class MyLocust(User):


cyberw · 2020-04-06T07:10:47Z

locust/test/test_main.py

 from .testcases import LocustTestCase
 from .mock_locustfile import mock_locustfile


 class TestLoadLocustfile(LocustTestCase):
    def test_is_locust(self):
-        self.assertFalse(main.is_locust(("Locust", Locust)))
+        self.assertFalse(main.is_locust(("Locust", User)))


heyman · 2020-04-16T21:12:55Z

👍

All of the documentation stills needs updating as well

I currently get an exception when I run locust --help with this PR.

…me_locust_to_user

anuj-ssharma · 2020-04-16T22:16:31Z

Still working through this sorry !

anuj-ssharma · 2020-04-16T22:18:55Z

I think I've messed up with merge conflicts

…me_locust_to_user

anuj-ssharma · 2020-04-17T04:33:05Z

Still need to update the documentation

cyberw · 2020-04-17T06:56:41Z

examples/custom_xmlrpc_client/xmlrpc_locustfile.py

@@ -31,7 +31,7 @@ def wrapper(*args, **kwargs):
        return wrapper


-class XmlRpcLocust(Locust):
+class XmlRpcLocust(User):


cyberw · 2020-04-17T06:57:03Z

locust/contrib/fasthttp.py

@@ -47,7 +47,7 @@ def _construct_basic_auth_str(username, password):
    return 'Basic ' + b64encode(b':'.join((username, password))).strip().decode("ascii")


-class FastHttpLocust(Locust):
+class FastHttpLocust(User):


FastHttpUser

cyberw · 2020-04-17T06:58:24Z

locust/core.py

@@ -511,7 +511,7 @@ def start(self, gevent_group):
        def run_locust(user):


cyberw · 2020-04-17T06:58:31Z

locust/core.py

@@ -511,7 +511,7 @@ def start(self, gevent_group):
        def run_locust(user):
            """
            Main function for Locust user greenlet. It's important that this function takes the locust 


user instance

cyberw · 2020-04-17T06:58:58Z

locust/core.py

@@ -538,12 +538,12 @@ def stop(self, gevent_group, force=False):
            return False


-class HttpLocust(Locust):
+class HttpLocust(User):


…me_locust_to_user

anuj-ssharma · 2020-04-19T23:33:43Z

@cyberw @heyman
What are your opinions on renaming the option locust_classes to user_classes ?

cyberw · 2020-04-21T07:35:43Z

The last commit broke the build (seems some tests need updating), but if you fix that then I then I am +1 to merge!

Fix a broken test.

heyman · 2020-04-21T08:59:14Z

Great work!

The last commit broke the build (seems some tests need updating), but if you fix that then I then I am +1 to merge!

I've fixed the broken tests, but I'd like some time to go through the changes a bit more thoroughly before be merge. Hopefully I'll be able to do that later today/tonight.

…me_locust_to_user

anuj-ssharma · 2020-04-22T03:06:43Z

My last commit (which is a merge) will break tests. Will analyse and fix them.

anuj-ssharma · 2020-04-22T04:29:03Z

My last commit (which is a merge) will break tests. Will analyse and fix them.

and fixed now !

heyman · 2020-04-23T12:44:26Z

Merged!

Anuj Sharma added 3 commits April 6, 2020 16:43

Rename Locust to User

66e7942

Rename client to users where applicable

26573d8

Correct the usage in tests

c6207d3

heyman reviewed Apr 6, 2020

View reviewed changes

locust/core.py Show resolved Hide resolved

heyman linked an issue Apr 6, 2020 that may be closed by this pull request

Rename Locust to User/LocustUser #1283

Closed

Merge remote-tracking branch 'locustmaster/master' into rename_locust…

ad5f4b0

…_to_user

cyberw mentioned this pull request Apr 15, 2020

clean up core.py & __init__.py #1328

Closed

cyberw reviewed Apr 16, 2020

View reviewed changes

Anuj Sharma added 2 commits April 17, 2020 08:20

Rename clients options to users and suppress the existing ones

0777fba

More renaming from locust to user

01a733f

Anuj Sharma added 2 commits April 17, 2020 09:31

Merge branch 'master' of https://github.com/locustio/locust into rena…

b0ff683

…me_locust_to_user

More renaming

7db61c7

Anuj Sharma added 5 commits April 17, 2020 10:31

Merge branch 'master' of https://github.com/locustio/locust into rena…

ad584f5

…me_locust_to_user

More renaming. This was causing the earlier build to fail.

c783824

rever to -c

5589257

use User class in test data

25d253c

Rename runners

3c03129

cyberw reviewed Apr 17, 2020

View reviewed changes

anuj-ssharma added 3 commits April 18, 2020 16:42

Merge branch 'master' of https://github.com/locustio/locust into rena…

fdd4d5f

…me_locust_to_user

Merge branch 'master' of https://github.com/locustio/locust into rena…

39a42cc

…me_locust_to_user

Use user instead of Locust

b990796

heyman added 2 commits April 21, 2020 10:47

Rename Runner.users to Runner.user_greenlets.

a8239a3

Fix a broken test.

Fix broken tests

5d23b6d

heyman and others added 4 commits April 21, 2020 16:41

Change LocustClass to UserClass in CLI help message

6a2e914

Fix docstring

f53d397

Replace renamed -c flag with -u in the docs examples

0dc6f05

Merge branch 'master' of https://github.com/locustio/locust into rena…

c078cad

…me_locust_to_user

anuj-ssharma added 3 commits April 22, 2020 15:09

fix broken test

405dd86

More renaming after merging from master

e450dc2

fix broken test

8ba4629

heyman added 13 commits April 22, 2020 09:44

A fem more Locust -> User renames

3723be5

A fem more Locust -> User renames

cc8d553

Rename locust attribute on TaskSet to user

3667397

Rename locust -> user in docstrings

47c104b

Rename is_locust function to is_user_class

ad42d4e

More "locust" -> "user" renaming

17edbb6

Rename "locust" to -> "user" in WebUI HTML template

29c18cf

Increase sleep time to make test less flaky

796d86e

More "locust" -> "user" renaming

8db7c2d

Update python references in documentation ("locust" -> "user" renaming)

08228a4

Use new tasks API in example that had been missed

339eae3

Rename local variable worker_num_clients to worker_num_users

4f4b83b

Add entry about "Locust" -> "User" renaming, to Changelog

5aca141

heyman merged commit cac9add into locustio:master Apr 23, 2020

anuj-ssharma deleted the rename_locust_to_user branch April 23, 2020 20:36

heyman added this to the 1.0 milestone Apr 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename locust to user #1314

Rename locust to user #1314

anuj-ssharma commented Apr 6, 2020

codecov bot commented Apr 6, 2020 •

edited

Loading

cyberw commented Apr 6, 2020

heyman commented Apr 6, 2020

cyberw commented Apr 9, 2020

cyberw Apr 6, 2020

cyberw Apr 6, 2020

cyberw Apr 6, 2020

heyman commented Apr 16, 2020

anuj-ssharma commented Apr 16, 2020

anuj-ssharma commented Apr 16, 2020

anuj-ssharma commented Apr 17, 2020

cyberw Apr 17, 2020

cyberw Apr 17, 2020

cyberw Apr 17, 2020

cyberw Apr 17, 2020

cyberw Apr 17, 2020

anuj-ssharma commented Apr 19, 2020

cyberw commented Apr 21, 2020

heyman commented Apr 21, 2020

anuj-ssharma commented Apr 22, 2020

anuj-ssharma commented Apr 22, 2020

heyman commented Apr 23, 2020

		@@ -511,7 +511,7 @@ def start(self, gevent_group):
		def run_locust(user):

Rename locust to user #1314

Rename locust to user #1314

Conversation

anuj-ssharma commented Apr 6, 2020

codecov bot commented Apr 6, 2020 • edited Loading

Codecov Report

cyberw commented Apr 6, 2020

heyman commented Apr 6, 2020

cyberw commented Apr 9, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heyman commented Apr 16, 2020

anuj-ssharma commented Apr 16, 2020

anuj-ssharma commented Apr 16, 2020

anuj-ssharma commented Apr 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anuj-ssharma commented Apr 19, 2020

cyberw commented Apr 21, 2020

heyman commented Apr 21, 2020

anuj-ssharma commented Apr 22, 2020

anuj-ssharma commented Apr 22, 2020

heyman commented Apr 23, 2020

codecov bot commented Apr 6, 2020 •

edited

Loading