New v2 ModuleArgsParser code and fixing up tests/other task code

test/v2/parsing/test_mod_args.py

@@ -13,67 +13,69 @@ class TestModArgsDwim(unittest.TestCase):
         pass
 
     def test_action_to_shell(self):
-        mod, args, to = self.m.parse('action', 'shell echo hi')
-        assert mod == 'shell'
+        mod, args, to = self.m.parse(dict(action='shell echo hi'))
+        assert mod == 'command'
         assert args == dict(
-            free_form = 'echo hi',
-            use_shell = True
+            _raw_params = 'echo hi',
+            _uses_shell = True,
         )
         assert to is None
 
     def test_basic_shell(self):
-        mod, args, to = self.m.parse('shell', 'echo hi')
-        assert mod == 'shell'
+        mod, args, to = self.m.parse(dict(shell='echo hi'))
+        assert mod == 'command'
         assert args == dict(
-           free_form = 'echo hi',
-           use_shell = True
+           _raw_params = 'echo hi',
+           _uses_shell = True,
         )
         assert to is None
 
     def test_basic_command(self):
-        mod, args, to = self.m.parse('command', 'echo hi')
+        mod, args, to = self.m.parse(dict(command='echo hi'))
         assert mod == 'command'
         assert args == dict(
-           free_form = 'echo hi',
-           use_shell = False
+           _raw_params = 'echo hi',
         )
         assert to is None
 
     def test_shell_with_modifiers(self):
-        mod, args, to = self.m.parse('shell', '/bin/foo creates=/tmp/baz removes=/tmp/bleep')
-        assert mod == 'shell'
+        mod, args, to = self.m.parse(dict(shell='/bin/foo creates=/tmp/baz removes=/tmp/bleep'))
+        assert mod == 'command'
         assert args == dict(
-           free_form = 'echo hi',
-           use_shell = False,
-           creates   = '/tmp/baz',
-           removes   = '/tmp/bleep'
+           creates     = '/tmp/baz',
+           removes     = '/tmp/bleep',
+           _raw_params = '/bin/foo',
+           _uses_shell = True,
         )
         assert to is None
 
     def test_normal_usage(self):
-        mod, args, to = self.m.parse('copy', 'src=a dest=b')
+        mod, args, to = self.m.parse(dict(copy='src=a dest=b'))
         assert mod == 'copy'
         assert args == dict(src='a', dest='b')
         assert to is None
 
     def test_complex_args(self):
-        mod, args, to = self.m.parse('copy', dict(src=a, dest=b))
+        mod, args, to = self.m.parse(dict(copy=dict(src='a', dest='b')))
         assert mod == 'copy'
-        assert args == dict(src = 'a', dest = 'b')
+        assert args == dict(src='a', dest='b')
         assert to is None
 
     def test_action_with_complex(self):
-        mod, args, to = self.m.parse('action', dict(module='copy',src='a',dest='b'))
-        assert mod == 'action'
-        assert args == dict(src = 'a', dest = 'b')
+        mod, args, to = self.m.parse(dict(action=dict(module='copy', src='a', dest='b')))
+        assert mod == 'copy'
+        assert args == dict(src='a', dest='b')
+        assert to is None
+
+    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'))))
+        assert mod == 'copy'
+        assert args == dict(src='a', dest='b')
         assert to is None
 
     def test_local_action_string(self):
-        mod, args, to = self.m.parse('local_action', 'copy src=a dest=b')
+        mod, args, to = self.m.parse(dict(local_action='copy src=a dest=b'))
         assert mod == 'copy'
-        assert args == dict(src=a, dest=b)
+        assert args == dict(src='a', dest='b')
         assert to is 'localhost' 
 
-
-    
-