From 99c7c12abac5cb8c85535f6587eae040a77edf15 Mon Sep 17 00:00:00 2001 From: yannis Date: Tue, 2 Feb 2016 10:43:00 -0800 Subject: [PATCH] Fix for mine to merge configuration on update. This fix was previously applied to 2015.5. It fixes #30722 --- salt/modules/mine.py | 2 +- tests/unit/modules/mine_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/mine.py b/salt/modules/mine.py index bad5c23a3f70..50e8237fbeab 100644 --- a/salt/modules/mine.py +++ b/salt/modules/mine.py @@ -102,7 +102,7 @@ def update(clear=False): salt '*' mine.update ''' - m_data = __salt__['config.option']('mine_functions', {}) + m_data = __salt__['config.merge']('mine_functions', {}) data = {} for func in m_data: try: diff --git a/tests/unit/modules/mine_test.py b/tests/unit/modules/mine_test.py index 987c56274bbf..3935604cb4fa 100644 --- a/tests/unit/modules/mine_test.py +++ b/tests/unit/modules/mine_test.py @@ -39,7 +39,7 @@ def test_update(self): Test for Execute the configured functions ''' with patch.dict(mine.__salt__, - {'config.option': MagicMock(return_value={'A': 'B'}), + {'config.merge': MagicMock(return_value={'A': 'B'}), 'data.update': MagicMock(return_value='A'), 'A': MagicMock(return_value='B')}): with patch.dict(mine.__opts__, {'file_client': 'local',