V2 fixing bugs

v2/test/mock/loader.py

@@ -47,6 +47,9 @@ class DictDataLoader(DataLoader):
     def is_directory(self, path):
         return path in self._known_directories
 
+    def list_directory(self, path):
+        return [x for x in self._known_directories]
+
     def _add_known_directory(self, directory):
         if directory not in self._known_directories:
             self._known_directories.append(directory)

v2/test/playbook/test_block.py

@@ -75,9 +75,3 @@ class TestBlock(unittest.TestCase):
         self.assertEqual(len(b.block), 1)
         assert isinstance(b.block[0], Task)
 
-    def test_block_compile(self):
-        ds = [dict(action='foo')]
-        b = Block.load(ds)
-        tasks = b.compile()
-        self.assertEqual(len(tasks), 1)
-        self.assertIsInstance(tasks[0], Task)

v2/test/playbook/test_playbook.py

@@ -24,6 +24,7 @@ from ansible.compat.tests.mock import patch, MagicMock
 
 from ansible.errors import AnsibleError, AnsibleParserError
 from ansible.playbook import Playbook
+from ansible.vars import VariableManager
 
 from test.mock.loader import DictDataLoader
 
@@ -36,7 +37,8 @@ class TestPlaybook(unittest.TestCase):
         pass
 
     def test_empty_playbook(self):
-        p = Playbook()
+        fake_loader = DictDataLoader({})
+        p = Playbook(loader=fake_loader)
 
     def test_basic_playbook(self):
         fake_loader = DictDataLoader({
@@ -61,6 +63,7 @@ class TestPlaybook(unittest.TestCase):
 
             """,
         })
-        self.assertRaises(AnsibleParserError, Playbook.load, "bad_list.yml", fake_loader)
-        self.assertRaises(AnsibleParserError, Playbook.load, "bad_entry.yml", fake_loader)
+        vm = VariableManager()
+        self.assertRaises(AnsibleParserError, Playbook.load, "bad_list.yml", vm, fake_loader)
+        self.assertRaises(AnsibleParserError, Playbook.load, "bad_entry.yml", vm, fake_loader)
 

v2/test/playbook/test_task_include.py

@@ -1,64 +0,0 @@
-# (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# 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 ansible.errors import AnsibleParserError
-from ansible.parsing.yaml.objects import AnsibleMapping
-from ansible.playbook.task_include import TaskInclude
-
-from test.mock.loader import DictDataLoader
-
-class TestTaskInclude(unittest.TestCase):
-
-    def setUp(self):
-        self._fake_loader = DictDataLoader({
-            "foo.yml": """
-            - shell: echo "hello world"
-            """
-        })
-
-        pass
-
-    def tearDown(self):
-        pass
-
-    def test_empty_task_include(self):
-        ti = TaskInclude()
-
-    def test_basic_task_include(self):
-        ti = TaskInclude.load(AnsibleMapping(include='foo.yml'), loader=self._fake_loader)
-        tasks = ti.compile()
-
-    def test_task_include_with_loop(self):
-        ti = TaskInclude.load(AnsibleMapping(include='foo.yml', with_items=['a', 'b', 'c']), loader=self._fake_loader)
-
-    def test_task_include_with_conditional(self):
-        ti = TaskInclude.load(AnsibleMapping(include='foo.yml', when="1 == 1"), loader=self._fake_loader)
-
-    def test_task_include_with_tags(self):
-        ti = TaskInclude.load(AnsibleMapping(include='foo.yml', tags="foo"), loader=self._fake_loader)
-        ti = TaskInclude.load(AnsibleMapping(include='foo.yml', tags=["foo", "bar"]), loader=self._fake_loader)
-
-    def test_task_include_errors(self):
-        self.assertRaises(AnsibleParserError, TaskInclude.load, AnsibleMapping(include=''), loader=self._fake_loader)
-        self.assertRaises(AnsibleParserError, TaskInclude.load, AnsibleMapping(include='foo.yml', vars="1"), loader=self._fake_loader)
-        self.assertRaises(AnsibleParserError, TaskInclude.load, AnsibleMapping(include='foo.yml a=1', vars=dict(b=2)), loader=self._fake_loader)
-

v2/test/vars/test_variable_manager.py

@@ -35,8 +35,10 @@ class TestVariableManager(unittest.TestCase):
         pass
 
     def test_basic_manager(self):
+        fake_loader = DictDataLoader({})
+
         v = VariableManager()
-        self.assertEqual(v.get_vars(), dict())
+        self.assertEqual(v.get_vars(loader=fake_loader), dict())
 
         self.assertEqual(
             v._merge_dicts(
@@ -52,23 +54,26 @@ class TestVariableManager(unittest.TestCase):
         )
 
 
-    def test_manager_extra_vars(self):
+    def test_variable_manager_extra_vars(self):
+        fake_loader = DictDataLoader({})
+
         extra_vars = dict(a=1, b=2, c=3)
         v = VariableManager()
         v.set_extra_vars(extra_vars)
 
-        self.assertEqual(v.get_vars(), extra_vars)
-        self.assertIsNot(v.extra_vars, extra_vars)
+        for (key, val) in extra_vars.iteritems():
+            self.assertEqual(v.get_vars(loader=fake_loader).get(key), val)
+            self.assertIsNot(v.extra_vars.get(key), val)
 
-    def test_manager_host_vars_file(self):
+    def test_variable_manager_host_vars_file(self):
         fake_loader = DictDataLoader({
             "host_vars/hostname1.yml": """
                foo: bar
             """
         })
 
-        v = VariableManager(loader=fake_loader)
-        v.add_host_vars_file("host_vars/hostname1.yml")
+        v = VariableManager()
+        v.add_host_vars_file("host_vars/hostname1.yml", loader=fake_loader)
         self.assertIn("hostname1", v._host_vars_files)
         self.assertEqual(v._host_vars_files["hostname1"], dict(foo="bar"))
 
@@ -77,37 +82,43 @@ class TestVariableManager(unittest.TestCase):
         mock_host.get_vars.return_value = dict()
         mock_host.get_groups.return_value = ()
 
-        self.assertEqual(v.get_vars(host=mock_host), dict(foo="bar"))
+        self.assertEqual(v.get_vars(loader=fake_loader, host=mock_host).get("foo"), "bar")
 
-    def test_manager_group_vars_file(self):
+    def test_variable_manager_group_vars_file(self):
         fake_loader = DictDataLoader({
             "group_vars/somegroup.yml": """
                foo: bar
             """
         })
 
-        v = VariableManager(loader=fake_loader)
-        v.add_group_vars_file("group_vars/somegroup.yml")
+        v = VariableManager()
+        v.add_group_vars_file("group_vars/somegroup.yml", loader=fake_loader)
         self.assertIn("somegroup", v._group_vars_files)
         self.assertEqual(v._group_vars_files["somegroup"], dict(foo="bar"))
 
+        mock_group = MagicMock()
+        mock_group.name.return_value = "somegroup"
+        mock_group.get_ancestors.return_value = ()
+
         mock_host = MagicMock()
         mock_host.get_name.return_value = "hostname1"
         mock_host.get_vars.return_value = dict()
-        mock_host.get_groups.return_value = ["somegroup"]
+        mock_host.get_groups.return_value = (mock_group)
 
-        self.assertEqual(v.get_vars(host=mock_host), dict(foo="bar"))
+        self.assertEqual(v.get_vars(loader=fake_loader, host=mock_host).get("foo"), "bar")
+
+    def test_variable_manager_play_vars(self):
+        fake_loader = DictDataLoader({})
 
-    def test_manager_play_vars(self):
         mock_play = MagicMock()
         mock_play.get_vars.return_value = dict(foo="bar")
         mock_play.get_roles.return_value = []
         mock_play.get_vars_files.return_value = []
 
         v = VariableManager()
-        self.assertEqual(v.get_vars(play=mock_play), dict(foo="bar"))
+        self.assertEqual(v.get_vars(loader=fake_loader, play=mock_play).get("foo"), "bar")
 
-    def test_manager_play_vars_files(self):
+    def test_variable_manager_play_vars_files(self):
         fake_loader = DictDataLoader({
             "/path/to/somefile.yml": """
                foo: bar
@@ -119,13 +130,15 @@ class TestVariableManager(unittest.TestCase):
         mock_play.get_roles.return_value = []
         mock_play.get_vars_files.return_value = ['/path/to/somefile.yml']
 
-        v = VariableManager(loader=fake_loader)
-        self.assertEqual(v.get_vars(play=mock_play), dict(foo="bar"))
+        v = VariableManager()
+        self.assertEqual(v.get_vars(loader=fake_loader, play=mock_play).get("foo"), "bar")
+
+    def test_variable_manager_task_vars(self):
+        fake_loader = DictDataLoader({})
 
-    def test_manager_task_vars(self):
         mock_task = MagicMock()
         mock_task.get_vars.return_value = dict(foo="bar")
 
         v = VariableManager()
-        self.assertEqual(v.get_vars(task=mock_task), dict(foo="bar"))
+        self.assertEqual(v.get_vars(loader=fake_loader, task=mock_task).get("foo"), "bar")