Somehow, git mv only rm'd test/v2 and didn't add v2/test

v2/test/parsing/__init__.py

@@ -0,0 +1,16 @@
+# (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/>.

v2/test/parsing/test_general.py

@@ -0,0 +1,102 @@
+# (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/>.
+
+from ..compat import unittest
+from ansible.parsing import load
+from ansible.errors import AnsibleParserError
+
+import json
+
+from io import FileIO
+
+class MockFile(FileIO):
+
+    def __init__(self, ds, method='json'):
+        self.ds = ds
+        self.method = method
+
+    def read(self):
+        if method == 'json':
+            return json.dumps(ds)
+        elif method == 'yaml':
+            return yaml.dumps(ds)
+        elif method == 'fail':
+            return """
+            AAARGGGGH
+               THIS WON'T PARSE !!!
+                  NOOOOOOOOOOOOOOOOOO
+            """
+        else:
+            raise Exception("untestable serializer")
+
+    def close(self):
+        pass
+
+class TestGeneralParsing(unittest.TestCase):
+
+    def __init__(self):
+        pass
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def parse_json_from_string(self):
+        input = """
+        {
+            "asdf" : "1234",
+            "jkl" : 5678
+        }
+        """
+        output = load(input)
+        self.assertEqual(output['asdf'], '1234')
+        self.assertEqual(output['jkl'], 5678)
+
+    def parse_json_from_file(self):
+        output = load(MockFile(dict(a=1,b=2,c=3)),'json')
+        self.assertEqual(ouput, dict(a=1,b=2,c=3))
+
+    def parse_yaml_from_dict(self):
+        input = """
+        asdf: '1234'
+        jkl: 5678
+        """
+        output = load(input)
+        self.assertEqual(output['asdf'], '1234')
+        self.assertEqual(output['jkl'], 5678)
+
+    def parse_yaml_from_file(self):
+        output = load(MockFile(dict(a=1,b=2,c=3),'yaml'))
+        self.assertEqual(output, dict(a=1,b=2,c=3))
+
+    def parse_fail(self):
+        input = """
+        TEXT
+            ***
+               NOT VALID
+        """
+        self.assertRaises(load(input), AnsibleParserError)
+
+    def parse_fail_from_file(self):
+        self.assertRaises(load(MockFile(None,'fail')), AnsibleParserError)
+
+    def parse_fail_invalid_type(self):
+        self.assertRaises(3000, AnsibleParsingError)
+        self.assertRaises(dict(a=1,b=2,c=3), AnsibleParserError)
+

v2/test/parsing/test_mod_args.py

@@ -0,0 +1,104 @@
+# (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/>.
+
+from ansible.parsing.mod_args import ModuleArgsParser
+
+from .. compat import CompatTestCase
+
+class TestModArgsDwim(CompatTestCase):
+
+    # TODO: add tests that construct ModuleArgsParser with a task reference
+    # TODO: verify the AnsibleError raised on failure knows the task
+    #       and the task knows the line numbers
+
+    def setUp(self):
+        self.m = ModuleArgsParser()
+        pass
+
+    def _debug(self, mod, args, to):
+        print("RETURNED module = {0}".format(mod))
+        print("           args = {0}".format(args))
+        print("             to = {0}".format(to))
+
+    def tearDown(self):
+        pass
+
+    def test_basic_shell(self):
+        mod, args, to = self.m.parse(dict(shell='echo hi'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                _raw_params = 'echo hi',
+                                _uses_shell = True,
+                        ))
+        self.assertIsNone(to)
+
+    def test_basic_command(self):
+        mod, args, to = self.m.parse(dict(command='echo hi'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                _raw_params = 'echo hi',
+                        ))
+        self.assertIsNone(to)
+
+    def test_shell_with_modifiers(self):
+        mod, args, to = self.m.parse(dict(shell='/bin/foo creates=/tmp/baz removes=/tmp/bleep'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                creates     = '/tmp/baz',
+                                removes     = '/tmp/bleep',
+                                _raw_params = '/bin/foo',
+                                _uses_shell = True,
+                        ))
+        self.assertIsNone(to)
+
+    def test_normal_usage(self):
+        mod, args, to = self.m.parse(dict(copy='src=a dest=b'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_complex_args(self):
+        mod, args, to = self.m.parse(dict(copy=dict(src='a', dest='b')))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_action_with_complex(self):
+        mod, args, to = self.m.parse(dict(action=dict(module='copy', src='a', dest='b')))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_action_with_complex_and_complex_args(self):
+        mod, args, to = self.m.parse(dict(action=dict(module='copy', args=dict(src='a', dest='b'))))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_local_action_string(self):
+        mod, args, to = self.m.parse(dict(local_action='copy src=a dest=b'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIs(to, 'localhost')

v2/test/parsing/test_mod_args.py.py3

@@ -0,0 +1,104 @@
+# (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/>.
+
+from ansible.parsing.mod_args import ModuleArgsParser
+
+from .. compat import CompatTestCase
+
+class TestModArgsDwim(CompatTestCase):
+
+    # TODO: add tests that construct ModuleArgsParser with a task reference
+    # TODO: verify the AnsibleError raised on failure knows the task
+    #       and the task knows the line numbers
+
+    def setUp(self):
+        self.m = ModuleArgsParser()
+        pass
+
+    def _debug(self, mod, args, to):
+        print("RETURNED module = {0}".format(mod))
+        print("           args = {0}".format(args))
+        print("             to = {0}".format(to))
+
+    def tearDown(self):
+        pass
+
+    def test_basic_shell(self):
+        mod, args, to = self.m.parse(dict(shell='echo hi'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                _raw_params = 'echo hi',
+                                _uses_shell = True,
+                        ))
+        self.assertIsNone(to)
+
+    def test_basic_command(self):
+        mod, args, to = self.m.parse(dict(command='echo hi'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                _raw_params = 'echo hi',
+                        ))
+        self.assertIsNone(to)
+
+    def test_shell_with_modifiers(self):
+        mod, args, to = self.m.parse(dict(shell='/bin/foo creates=/tmp/baz removes=/tmp/bleep'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'command')
+        self.assertEqual(args, dict(
+                                creates     = '/tmp/baz',
+                                removes     = '/tmp/bleep',
+                                _raw_params = '/bin/foo',
+                                _uses_shell = True,
+                        ))
+        self.assertIsNone(to)
+
+    def test_normal_usage(self):
+        mod, args, to = self.m.parse(dict(copy='src=a dest=b'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_complex_args(self):
+        mod, args, to = self.m.parse(dict(copy=dict(src='a', dest='b')))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_action_with_complex(self):
+        mod, args, to = self.m.parse(dict(action=dict(module='copy', src='a', dest='b')))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_action_with_complex_and_complex_args(self):
+        mod, args, to = self.m.parse(dict(action=dict(module='copy', args=dict(src='a', dest='b'))))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIsNone(to)
+
+    def test_local_action_string(self):
+        mod, args, to = self.m.parse(dict(local_action='copy src=a dest=b'))
+        self._debug(mod, args, to)
+        self.assertEqual(mod, 'copy')
+        self.assertEqual(args, dict(src='a', dest='b'))
+        self.assertIs(to, 'localhost')

v2/test/parsing/yaml/__init__.py

@@ -0,0 +1,16 @@
+# (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/>.

v2/test/parsing/yaml/test_yaml.py

@@ -0,0 +1,96 @@
+# (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/>.
+
+from ..compat import unittest
+
+from yaml.scanner import ScannerError
+
+from ansible.parsing.yaml import safe_load
+from ansible.parsing.yaml.objects import AnsibleMapping
+
+# a single dictionary instance
+data1 = '''---
+key: value
+'''
+
+# multiple dictionary instances
+data2 = '''---
+- key1: value1
+- key2: value2
+
+- key3: value3
+
+
+- key4: value4
+'''
+
+# multiple dictionary instances with other nested
+# dictionaries contained within those
+data3 = '''---
+- key1:
+    subkey1: subvalue1
+    subkey2: subvalue2
+    subkey3:
+      subsubkey1: subsubvalue1
+- key2:
+    subkey4: subvalue4
+- list1:
+  - list1key1: list1value1
+    list1key2: list1value2
+    list1key3: list1value3
+'''
+
+bad_data1 = '''---
+foo: bar
+  bam: baz
+'''
+
+class TestSafeLoad(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_safe_load_bad(self):
+        # test the loading of bad yaml data
+        self.assertRaises(ScannerError, safe_load, bad_data1)
+
+    def test_safe_load(self):
+        # test basic dictionary
+        res = safe_load(data1)
+        self.assertEqual(type(res), AnsibleMapping)
+        self.assertEqual(res._line_number, 2)
+
+        # test data with multiple dictionaries
+        res = safe_load(data2)
+        self.assertEqual(len(res), 4)
+        self.assertEqual(res[0]._line_number, 2)
+        self.assertEqual(res[1]._line_number, 3)
+        self.assertEqual(res[2]._line_number, 5)
+        self.assertEqual(res[3]._line_number, 8)
+
+        # test data with multiple sub-dictionaries
+        res = safe_load(data3)
+        self.assertEqual(len(res), 3)
+        self.assertEqual(res[0]._line_number, 2)
+        self.assertEqual(res[1]._line_number, 7)
+        self.assertEqual(res[2]._line_number, 9)
+        self.assertEqual(res[0]['key1']._line_number, 3)
+        self.assertEqual(res[1]['key2']._line_number, 8)
+        self.assertEqual(res[2]['list1'][0]._line_number, 10)