Creating playbook executor and dependent classes

v2/test/errors/test_errors.py

@@ -39,8 +39,8 @@ class TestErrors(unittest.TestCase):
 
     def test_basic_error(self):
         e = AnsibleError(self.message)
-        self.assertEqual(e.message, self.message)
-        self.assertEqual(e.__repr__(), self.message)
+        self.assertEqual(e.message, 'ERROR! ' + self.message)
+        self.assertEqual(e.__repr__(), 'ERROR! ' + self.message)
 
     @patch.object(AnsibleError, '_get_error_lines_from_file')
     def test_error_with_object(self, mock_method):
@@ -51,7 +51,7 @@ class TestErrors(unittest.TestCase):
         mock_method.return_value = ('this is line 1\n', '')
         e = AnsibleError(self.message, self.obj)
 
-        self.assertEqual(e.message, "This is the error message\n\nThe error appears to have been in 'foo.yml': line 1, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nthis is line 1\n^\n")
+        self.assertEqual(e.message, "ERROR! This is the error message\n\nThe error appears to have been in 'foo.yml': line 1, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\nthis is line 1\n^ here\n")
 
     def test_get_error_lines_from_file(self):
         m = mock_open()
@@ -63,12 +63,12 @@ class TestErrors(unittest.TestCase):
             self.obj._line_number   = 1
             self.obj._column_number = 1
             e = AnsibleError(self.message, self.obj)
-            self.assertEqual(e.message, "This is the error message\n\nThe error appears to have been in 'foo.yml': line 1, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nthis is line 1\n^\n")
+            self.assertEqual(e.message, "ERROR! This is the error message\n\nThe error appears to have been in 'foo.yml': line 1, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\nthis is line 1\n^ here\n")
 
             # this line will not be found, as it is out of the index range
             self.obj._data_source   = 'foo.yml'
             self.obj._line_number   = 2
             self.obj._column_number = 1
             e = AnsibleError(self.message, self.obj)
-            self.assertEqual(e.message, "This is the error message\n\nThe error appears to have been in 'foo.yml': line 2, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\n(specified line no longer in file, maybe it changed?)")
+            self.assertEqual(e.message, "ERROR! This is the error message\n\nThe error appears to have been in 'foo.yml': line 2, column 1, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\n(specified line no longer in file, maybe it changed?)")
         

v2/test/executor/test_play_iterator.py

@@ -23,12 +23,12 @@ 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.executor.play_iterator import PlayIterator
 from ansible.playbook import Playbook
 
 from test.mock.loader import DictDataLoader
 
-class TestPlaybookIterator(unittest.TestCase):
+class TestPlayIterator(unittest.TestCase):
 
     def setUp(self):
         pass
@@ -36,10 +36,11 @@ class TestPlaybookIterator(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def test_playbook_iterator(self):
+    def test_play_iterator(self):
         fake_loader = DictDataLoader({
             "test_play.yml": """
             - hosts: all
+              gather_facts: false
               roles:
               - test_role
               pre_tasks:
@@ -64,8 +65,9 @@ class TestPlaybookIterator(unittest.TestCase):
 
         inventory = MagicMock()
         inventory.get_hosts.return_value = hosts
+        inventory.filter_hosts.return_value = hosts
 
-        itr = PlaybookIterator(inventory, None, p)
+        itr = PlayIterator(inventory, p._entries[0])
         task = itr.get_next_task_for_host(hosts[0])
         print(task)
         self.assertIsNotNone(task)

v2/test/mock/loader.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import os
 
-from ansible.parsing.yaml import DataLoader
+from ansible.parsing import DataLoader
 
 class DictDataLoader(DataLoader):
 

v2/test/parsing/test_data_loader.py

@@ -25,7 +25,7 @@ from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import patch
 from ansible.errors import AnsibleParserError
 
-from ansible.parsing.yaml import DataLoader
+from ansible.parsing import DataLoader
 from ansible.parsing.yaml.objects import AnsibleMapping
 
 class TestDataLoader(unittest.TestCase):

v2/test/parsing/yaml/__init__.py

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