Skip to content

Commit

Permalink
Fix errors on 'ansible-playbook --flush-cache' (ansible#18754)
Browse files Browse the repository at this point in the history
Add a unit test, and split out the flush cache logic to
it's own method.
Fixes ansible#18708
  • Loading branch information
alikins authored Dec 13, 2016
1 parent 6c4f554 commit 08a5d50
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/ansible/cli/playbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ def run(self):

# flush fact cache if requested
if self.options.flush_cache:
for host in inventory.list_hosts():
variable_manager.clear_facts(host)
self._flush_cache(inventory, variable_manager)

# create the playbook executor, which manages running the plays via a task queue manager
pbex = PlaybookExecutor(playbooks=self.args, inventory=inventory, variable_manager=variable_manager, loader=loader, options=self.options, passwords=passwords)
Expand Down Expand Up @@ -218,3 +217,8 @@ def _process_block(b):
return 0
else:
return results

def _flush_cache(self, inventory, variable_manager):
for host in inventory.list_hosts():
hostname = host.get_name()
variable_manager.clear_facts(hostname)
40 changes: 40 additions & 0 deletions test/units/cli/test_playbook.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# (c) 2016, Adrian Likins <[email protected]>
#
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.

# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from ansible.compat.tests import unittest
from units.mock.loader import DictDataLoader

from ansible.inventory import Inventory
from ansible.vars import VariableManager

from ansible.cli.playbook import PlaybookCLI


class TestPlaybookCLI(unittest.TestCase):
def test_flush_cache(self):
cli = PlaybookCLI(args=["--flush-cache", "foobar.yml"])

variable_manager = VariableManager()
fake_loader = DictDataLoader({'foobar.yml': ""})
inventory = Inventory(loader=fake_loader, variable_manager=variable_manager, host_list=['testhost'])

cli._flush_cache(inventory, variable_manager)
self.assertFalse('testhost' in variable_manager._fact_cache)

0 comments on commit 08a5d50

Please sign in to comment.