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

Jump to bottom

Provide default for datastore.secure in all cases #705

Merged
merged 1 commit into from
Jun 5, 2019
Merged

Provide default for datastore.secure in all cases #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions esrally/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ def create_config(self, config_file, advanced_config=False, assume_defaults=Fals
if data_store_choice == "1":
env_name = "local"
data_store_type = "in-memory"
data_store_host, data_store_port, data_store_secure, data_store_user, data_store_password = "", "", "", "", ""
data_store_host, data_store_port, data_store_secure, data_store_user, data_store_password = "", "", "False", "", ""
else:
data_store_type = "elasticsearch"
data_store_host, data_store_port, data_store_secure, data_store_user, data_store_password = self._ask_data_store()
Expand All @@ -365,7 +365,7 @@ def create_config(self, config_file, advanced_config=False, assume_defaults=Fals
# Does not matter for an in-memory store
env_name = "local"
data_store_type = "in-memory"
data_store_host, data_store_port, data_store_secure, data_store_user, data_store_password = "", "", "", "", ""
data_store_host, data_store_port, data_store_secure, data_store_user, data_store_password = "", "", "False", "", ""
preserve_install = False

config = configparser.ConfigParser()
Expand Down
2 changes: 1 addition & 1 deletion tests/config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def test_create_simple_config(self, guess_install_location, working_copy):
self.assertEqual("in-memory", config_store.config["reporting"]["datastore.type"])
self.assertEqual("", config_store.config["reporting"]["datastore.host"])
self.assertEqual("", config_store.config["reporting"]["datastore.port"])
self.assertEqual("", config_store.config["reporting"]["datastore.secure"])
self.assertEqual("False", config_store.config["reporting"]["datastore.secure"])
self.assertEqual("", config_store.config["reporting"]["datastore.user"])
self.assertEqual("", config_store.config["reporting"]["datastore.password"])

Expand Down