From 5226dfbf3cfebab00fe5b96ca4dba0a398911159 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Tue, 21 Mar 2017 11:02:10 -0700 Subject: [PATCH] config: show path of config file we're validating (#935) --- cli/dcoscli/config/main.py | 1 + cli/tests/integrations/test_config.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cli/dcoscli/config/main.py b/cli/dcoscli/config/main.py index 2300d40..b72cc23 100644 --- a/cli/dcoscli/config/main.py +++ b/cli/dcoscli/config/main.py @@ -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: diff --git a/cli/tests/integrations/test_config.py b/cli/tests/integrations/test_config.py index 06d8442..42e6236 100644 --- a/cli/tests/integrations/test_config.py +++ b/cli/tests/integrations/test_config.py @@ -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)