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.

Sign up for GitHub

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

Use ConfigArgParse instead of argparse, to support getting parameters from config file and/or env vars. #1167

Merged
merged 8 commits into from
Nov 25, 2019
Merged

Use ConfigArgParse instead of argparse, to support getting parameters from config file and/or env vars. #1167

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1e9d38
Use ConfigArgParse instead of argparse, to support getting parameters…
cyberw Nov 20, 2019
7004b50
Tiny doc changes.
cyberw Nov 20, 2019
178c2fe
Drive by fix of help text for no-web. Print web host as real url to a…
cyberw Nov 20, 2019
d2cb9d4
Merge branch 'master' of https://github.com/locustio/locust into get-…
cyberw Nov 21, 2019
a2e7ae5
Parametrize conf file location to facilitate testing,. Add test for c…
cyberw Nov 21, 2019
24fda18
Use tempfile.NamedTemporaryFile instead of a made up file name.
cyberw Nov 21, 2019
49a5825
Dont open public ports as part of test (mostly because it annoys soft…
cyberw Nov 21, 2019
42d1720
Undo the change where I set the port number to zero, because differen…
cyberw Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions locust/test/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
import os
import tempfile

from locust.main import parse_options

Expand Down Expand Up @@ -35,14 +36,13 @@ def test_skip_log_setup(self):
self.assertEqual(opts.skip_log_setup, True)

def test_parameter_parsing(self):
conf_file = '/tmp/locust.conf'
os.environ['LOCUST_LOCUSTFILE'] = "locustfile_from_env"
with open(conf_file, 'w') as file:
file.write("host host_from_config\nweb-host webhost_from_config\n")
parser, _ = parse_options(default_config_files=['/tmp/locust.conf'])
options = parser.parse_args(['-H','host_from_args'])
del os.environ['LOCUST_LOCUSTFILE'] # remove this so it doesnt impact later tests
os.remove(conf_file)
with tempfile.NamedTemporaryFile(mode='w') as file:
os.environ['LOCUST_LOCUSTFILE'] = "locustfile_from_env"
file.write("host host_from_config\nweb-host webhost_from_config")
file.flush()
parser, _ = parse_options(default_config_files=[file.name])
options = parser.parse_args(['-H','host_from_args'])
del os.environ['LOCUST_LOCUSTFILE']
self.assertEqual(options.web_host, 'webhost_from_config')
self.assertEqual(options.locustfile, 'locustfile_from_env')
self.assertEqual(options.host, 'host_from_args') # overridden
5 changes: 3 additions & 2 deletions locust/test/test_zmqrpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class ZMQRPC_tests(LocustTestCase):
def setUp(self):
super(ZMQRPC_tests, self).setUp()
self.server = zmqrpc.Server('*', 0)
self.server = zmqrpc.Server('127.0.0.1', 0)
self.client = zmqrpc.Client('localhost', self.server.port, 'identity')

def tearDown(self):
Expand Down Expand Up @@ -40,7 +40,8 @@ def test_client_recv(self):
self.assertEqual(msg.node_id, 'identity')

def test_client_retry(self):
server = zmqrpc.Server('0.0.0.0', 8888)
# use non-zero port this time, just to increase code coverage
server = zmqrpc.Server('127.0.0.1', 8888)
cyberw marked this conversation as resolved.
Show resolved Hide resolved
server.socket.close()
with self.assertRaises(zmq.error.ZMQError):
server.recv_from_client()