cli2 4.0.1__tar.gz → 4.0.3__tar.gz

{cli2-4.0.1/cli2.egg-info → cli2-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.0.1
+Version: 4.0.3
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.0.1 → cli2-4.0.3}/cli2/ansible/action.py

@@ -127,8 +127,8 @@ class ActionBase(ActionBase):
         The client object generated by :py:meth:`client_factory` if you
         implement it.
     """
-    def get(self, arg_name, fact_name=None, default=UNSET_DEFAULT):
-        if arg_name in self._task.args:
+    def get(self, arg_name=None, fact_name=None, default=UNSET_DEFAULT):
+        if arg_name and arg_name in self._task.args:
             return self._task.args[arg_name]
         if fact_name and fact_name in self.task_vars:
             return self.task_vars[fact_name]
@@ -237,15 +237,14 @@ class ActionBase(ActionBase):
         :param client: Client instance, overrides the factory
         :param fail: Allow this test to fail without exception
         """
-        import mock
+        from unittest import mock
         obj = cls(*[mock.Mock()] * 6)
         obj.tmp = None
-        obj.task_vars = mock.Mock()
         obj.result = dict()
         obj._task = mock.Mock()
         obj._task.args = args or {}
         obj.task_vars = facts or {}
-        obj.task_vars['ansible_verbosity'] = 1
+        obj.task_vars.setdefault('ansible_verbosity', 2)
         obj.exc = False
         if client:
             async def _factory():

{cli2-4.0.1 → cli2-4.0.3/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.0.1
+Version: 4.0.3
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.0.1 → cli2-4.0.3}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.0.1',
+    version='4.0.3',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',

{cli2-4.0.1 → cli2-4.0.3}/tests/test_ansible.py

@@ -39,30 +39,34 @@ async def test_response_error(httpx_mock):
 @pytest.mark.asyncio
 async def test_option():
     class Action(ansible.ActionBase):
-        name = ansible.Option('name', 'object_name', 'Test object')
+        fact = ansible.Option(fact='fact', default='default fact')
+        arg = ansible.Option(arg='arg', fact='arg_fact')
 
         async def run_async(self):
-            self.result['name'] = self.name
-
-    module = await Action.run_test_async(args=dict(name='foo'))
-    assert module.result['name'] == 'foo'
+            self.result['arg'] = self.arg
+            self.result['fact'] = self.fact
 
-    module = await Action.run_test_async(facts=dict(object_name='foo'))
-    assert module.result['name'] == 'foo'
 
-    module = await Action.run_test_async()
-    assert module.result['name'] == 'Test object'
-
-    class Action(ansible.ActionBase):
-        name = ansible.Option('name', 'object_name')
+    # test setting arg and fact
+    module = await Action.run_test_async(
+        args=dict(arg='arg'),
+        facts=dict(fact='fact'),
+    )
+    assert module.result['arg'] == 'arg'
+    assert module.result['fact'] == 'fact'
 
-        async def run_async(self):
-            self.result['name'] = self.name
+    # test default
+    module = await Action.run_test_async(
+        args=dict(arg='arg'),
+    )
+    assert module.result['arg'] == 'arg'
+    assert module.result['fact'] == 'default fact'
 
+    # test failing for missing default
     module = await Action.run_test_async(fail=True)
     assert module.result == dict(
         failed=True,
-        error="Missing arg `name` or fact `object_name`",
+        error="Missing arg `arg` or fact `arg_fact`",
     )
 
     class Action(ansible.ActionBase):