Adding v2 task/block iterator and some reorganizing

v2/test/executor/__init__.py

@@ -0,0 +1,21 @@
+# (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
+

v2/test/executor/test_playbook_iterator.py

@@ -0,0 +1,83 @@
+# (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.compat.tests.mock import patch, MagicMock
+
+from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.executor.playbook_iterator import PlaybookIterator
+from ansible.playbook import Playbook
+
+from test.mock.loader import DictDataLoader
+
+class TestPlaybookIterator(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_playbook_iterator(self):
+        fake_loader = DictDataLoader({
+            "test_play.yml": """
+            - hosts: all
+              roles:
+              - test_role
+              pre_tasks:
+              - debug: msg="this is a pre_task"
+              tasks:
+              - debug: msg="this is a regular task"
+              post_tasks:
+              - debug: msg="this is a post_task"
+            """,
+            '/etc/ansible/roles/test_role/tasks/main.yml': """
+            - debug: msg="this is a role task"
+            """,
+        })
+
+        p = Playbook.load('test_play.yml', loader=fake_loader)
+
+        hosts = []
+        for i in range(0, 10):
+            host  = MagicMock()
+            host.get_name.return_value = 'host%02d' % i
+            hosts.append(host)
+
+        inventory = MagicMock()
+        inventory.get_hosts.return_value = hosts
+
+        itr = PlaybookIterator(inventory, None, p)
+        task = itr.get_next_task_for_host(hosts[0])
+        print(task)
+        self.assertIsNotNone(task)
+        task = itr.get_next_task_for_host(hosts[0])
+        print(task)
+        self.assertIsNotNone(task)
+        task = itr.get_next_task_for_host(hosts[0])
+        print(task)
+        self.assertIsNotNone(task)
+        task = itr.get_next_task_for_host(hosts[0])
+        print(task)
+        self.assertIsNotNone(task)
+        task = itr.get_next_task_for_host(hosts[0])
+        print(task)
+        self.assertIsNone(task)

v2/test/playbook/test_block.py

@@ -75,3 +75,9 @@ 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_play.py

@@ -117,4 +117,16 @@ class TestPlay(unittest.TestCase):
             roles=['foo'],
         ), loader=fake_loader)
 
+        tasks = p.compile()
 
+    def test_play_compile(self):
+        p = Play.load(dict(
+            name="test play",
+            hosts=['foo'],
+            gather_facts=False,
+            tasks=[dict(action='shell echo "hello world"')],
+        ))
+
+        tasks = p.compile()
+        self.assertEqual(len(tasks), 1)
+        self.assertIsInstance(tasks[0], Task)

v2/test/playbook/test_playbook.py

@@ -45,6 +45,7 @@ class TestPlaybook(unittest.TestCase):
             """,
         })
         p = Playbook.load("test_file.yml", loader=fake_loader)
+        entries = p.get_entries()
 
     def test_bad_playbook_files(self):
         fake_loader = DictDataLoader({

v2/test/playbook/test_task_include.py

@@ -45,6 +45,7 @@ class TestTaskInclude(unittest.TestCase):
 
     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)