Skip to content

🐛 json data shall override environment data too #153

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

Merged
merged 5 commits into from
Jan 6, 2019
Merged

🐛 json data shall override environment data too #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b44caa5
:bug: json data shall override environment data too
chfw Jan 6, 2019
23220f9
:microscope: test json overidence
chfw Jan 6, 2019
a67bd6c
:hammer: remove blind exception handler
chfw Jan 6, 2019
ca1489e
:microscope: test incorrrect data file intput
chfw Jan 6, 2019
663b1cf
:fire: remove duplicated error handler
chfw Jan 6, 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
9 changes: 4 additions & 5 deletions moban/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,18 +191,17 @@ def get_data(self, file_name):
data = utils.open_json(self.context_dirs, file_name)
elif file_extension in [".yml", ".yaml"]:
data = utils.open_yaml(self.context_dirs, file_name)
utils.merge(data, self.__cached_environ_variables)
else:
raise exceptions.IncorrectDataInput
utils.merge(data, self.__cached_environ_variables)
return data
except Exception as exception:
except (IOError, exceptions.IncorrectDataInput) as exception:
# If data file doesn't exist:
# 1. Alert the user of their (potential) mistake
# 2. Attempt to use environment vars as data
reporter.report_info_message(str(exception))
reporter.report_warning_message(str(exception))
reporter.report_using_env_vars()
data = os.environ
return data
return self.__cached_environ_variables


def make_sure_all_pkg_are_loaded():
Expand Down
18 changes: 18 additions & 0 deletions tests/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,21 @@ def test_environ_variables():
context = Context(os.path.join("tests", "fixtures"))
data = context.get_data("simple.yaml")
eq_(data[test_var], test_value)


def test_json_data_overrides_environ_variables():
test_var = "TEST_ENVIRONMENT_VARIABLE"
test_value = "am I found"
os.environ[test_var] = test_value
context = Context(os.path.join("tests", "fixtures"))
data = context.get_data("simple.json")
eq_(data[test_var], test_value)


def test_unknown_data_file():
test_var = "TEST_ENVIRONMENT_VARIABLE"
test_value = "am I found"
os.environ[test_var] = test_value
context = Context(os.path.join("tests", "fixtures"))
data = context.get_data("unknown.data")
eq_(data[test_var], test_value)