openstack/deb-python-dcos
Code Issues Proposed changes

config: show path of config file we're validating (#935)

Browse Source
This commit is contained in:
Marc Abramowitz
2017-03-21 11:02:10 -07:00
committed by tamarrow
parent e08285c5ab
commit 5226dfbf3c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cli/dcoscli/config/main.py
View File

@@ -226,6 +226,7 @@ def _validate():
toml_config = config.get_config(True)
emitter.publish('Validating %s ...' % config.get_config_path())
errs = util.validate_json(toml_config._dictionary,
config.generate_root_schema(toml_config))
if len(errs) != 0:

7
cli/tests/integrations/test_config.py
View File

@@ -4,7 +4,7 @@ import os
import pytest
import six
from dcos import constants
from dcos import config, constants
from .helpers.common import (assert_command, config_set, config_unset,
exec_command, update_config)
@@ -191,7 +191,10 @@ def test_unset_top_property(env):
def test_validate(env):
stdout = b'Congratulations, your configuration is valid!\n'
os.environ['DCOS_CONFIG'] = env['DCOS_CONFIG']
stdout = 'Validating %s ...\n' % config.get_config_path() + \
'Congratulations, your configuration is valid!\n'
stdout = stdout.encode('utf-8')
assert_command(['dcos', 'config', 'validate'],
env=env, stdout=stdout)