Skip to content

Commit

Permalink
Merge pull request #164 from gregoil/smart_client_venv
Browse files Browse the repository at this point in the history
Smart client env-var
  • Loading branch information
gregoil committed Sep 22, 2019
2 parents 2d45da9 + 705d5fc commit ca4376b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import setup, find_packages


__version__ = "7.12.0"
__version__ = "7.13.0"

result_handlers = [
"db = rotest.core.result.handlers.db_handler:DBHandler",
Expand Down
5 changes: 5 additions & 0 deletions src/rotest/common/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ def get_configuration(configuration_schema,
"discoverer_blacklist": Option(
config_file_options=["discoverer_blacklist"],
default_value=[]),
"smart_client": Option(
config_file_options=["smart_client"],
environment_variables=["ROTEST_SMART_CLIENT"],
default_value=True),
"shell_startup_commands": Option(
config_file_options=["shell_startup_commands"],
default_value=[]),
Expand Down Expand Up @@ -271,6 +275,7 @@ def get_configuration(configuration_schema,


ROTEST_WORK_DIR = os.path.expanduser(CONFIGURATION.workdir)
SMART_CLIENT = CONFIGURATION.smart_client in (True, "True", "true")
RESOURCE_MANAGER_HOST = CONFIGURATION.host
DJANGO_MANAGER_PORT = int(CONFIGURATION.port)
API_BASE_URL = CONFIGURATION.api_base_url
Expand Down

0 comments on commit ca4376b

Please sign in to comment.