jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338382 )
Change subject: Moved config.yaml to a doc/examples/ directory
......................................................................
Moved config.yaml to a doc/examples/ directory
* It also allow to easier ship the example file when packaging
Bug: T154588
Change-Id: I657391da85d4ce38329222ffb42795fdfc782fa6
---
M cumin/tests/unit/test_cli.py
R doc/examples/config.yaml
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/cumin/tests/unit/test_cli.py b/cumin/tests/unit/test_cli.py
index f878f57..f768f4f 100644
--- a/cumin/tests/unit/test_cli.py
+++ b/cumin/tests/unit/test_cli.py
@@ -9,7 +9,7 @@
# Environment variables
_ENV = {'USER': 'root', 'SUDO_USER': 'user'}
# Command line arguments
-_ARGV = ['-c', 'cumin/config.yaml', '-d', '-m', 'sync', 'host', 'command1',
'command2']
+_ARGV = ['-c', 'doc/examples/config.yaml', '-d', '-m', 'sync', 'host',
'command1', 'command2']
class TestCLI(unittest.TestCase):
@@ -18,7 +18,7 @@
def _validate_parsed_args(self, args):
"""Validate that the parsed args have the proper values"""
self.assertTrue(args.debug)
- self.assertEqual(args.config, 'cumin/config.yaml')
+ self.assertEqual(args.config, 'doc/examples/config.yaml')
self.assertEqual(args.hosts, 'host')
self.assertEqual(args.commands, ['command1', 'command2'])
@@ -61,7 +61,7 @@
def test_parse_config(self):
"""The configuration file is properly parsed and accessible"""
- config = cli.parse_config('cumin/config.yaml')
+ config = cli.parse_config('doc/examples/config.yaml')
self.assertTrue('log_file' in config)
@mock.patch('cumin.cli.stderr')
diff --git a/cumin/config.yaml b/doc/examples/config.yaml
similarity index 75%
rename from cumin/config.yaml
rename to doc/examples/config.yaml
index 7feb37e..13f33f3 100644
--- a/cumin/config.yaml
+++ b/doc/examples/config.yaml
@@ -9,7 +9,7 @@
# Transport-specific configuration
clustershell:
- environment:
+ environment: # Environment variables that will be defined [optional]
ENV_VARIABLE: env_value
- ssh_options:
+ ssh_options: # SSH options passed to ClusterShell [optional]
- 'some_option'
--
To view, visit https://gerrit.wikimedia.org/r/338382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I657391da85d4ce38329222ffb42795fdfc782fa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/cumin
Gerrit-Branch: master
Gerrit-Owner: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
