pyinfra 3.0.dev0__py2.py3-none-any.whl → 3.0.1__py2.py3-none-any.whl

pyinfra_cli/util.py

@@ -58,19 +58,20 @@ def exec_file(filename, return_locals: bool = False, is_deploy_code: bool = Fals
         PYTHON_CODES[filename] = code
 
     # Create some base attributes for our "module"
-    data = {
-        "__file__": filename,
-    }
+    data = {"__file__": filename}
 
     # Execute the code with locals/globals going into the dict above
     try:
         exec(PYTHON_CODES[filename], data)
+    except PyinfraError:
+        # Raise pyinfra errors as-is
+        raise
     except Exception as e:
-        if isinstance(e, (PyinfraError, UnexpectedExternalError)):
-            raise
+        # Wrap & re-raise errors in user code so we highlight filename/etc
         raise UnexpectedExternalError(e, filename)
+    finally:
+        state.current_exec_filename = old_current_exec_filename
 
-    state.current_exec_filename = old_current_exec_filename
     return data
 
 
@@ -149,13 +150,15 @@ def parse_cli_arg(arg):
     return arg
 
 
-def try_import_module_attribute(path, prefix=None, raise_for_no_module=True):
+def try_import_module_attribute(path, prefix=None, raise_for_none=True):
     if ":" in path:
         # Allow a.module.name:function syntax
         mod_path, attr_name = path.rsplit(":", 1)
-    else:
+    elif "." in path:
         # And also a.module.name.function
         mod_path, attr_name = path.rsplit(".", 1)
+    else:
+        return None
 
     possible_modules = [mod_path]
     if prefix:
@@ -176,13 +179,15 @@ def try_import_module_attribute(path, prefix=None, raise_for_no_module=True):
                 break
 
     if module is None:
-        if raise_for_no_module:
+        if raise_for_none:
             raise CliError(f"No such module: {possible_modules[-1]}")
         return
 
     attr = getattr(module, attr_name, None)
     if attr is None:
-        raise CliError(f"No such attribute in module {possible_modules[-1]}: {attr_name}")
+        if raise_for_none:
+            raise CliError(f"No such attribute in module {possible_modules[-1]}: {attr_name}")
+        return
 
     return attr
 

tests/test_api/test_api.py

@@ -1,4 +1,5 @@
 from unittest import TestCase
+from unittest.mock import patch
 
 from paramiko import SSHException
 
@@ -60,6 +61,7 @@ class TestInventoryApi(TestCase):
 
 
 class TestStateApi(PatchSSHTestCase):
+    @patch("pyinfra.connectors.base.raise_if_bad_type", lambda *args, **kwargs: None)
     def test_fail_percent(self):
         inventory = make_inventory(
             (

tests/test_api/test_api_arguments.py

@@ -16,40 +16,40 @@ class TestOperationKwargs(TestCase):
 
     def test_get_from_host(self):
         config = Config(SUDO="config-value")
-        inventory = Inventory(([("somehost", {"_sudo": "host-value"})], {}))
+        inventory = Inventory(([("somehost", {"_sudo": True})], {}))
 
         state = State(config=config, inventory=inventory)
 
         kwargs, keys = pop_global_arguments({}, state=state, host=inventory.get_host("somehost"))
-        assert kwargs["_sudo"] == "host-value"
+        assert kwargs["_sudo"] is True
 
     def test_get_from_state_deploy_kwargs(self):
         config = Config(SUDO="config-value")
-        inventory = Inventory(([("somehost", {"_sudo": "host-value"})], {}))
+        inventory = Inventory(([("somehost", {"_sudo": False})], {}))
         somehost = inventory.get_host("somehost")
 
         state = State(config=config, inventory=inventory)
-        somehost.current_deploy_kwargs = {"_sudo": "deploy-kwarg-value"}
+        somehost.current_deploy_kwargs = {"_sudo": True}
 
         kwargs, keys = pop_global_arguments({}, state=state, host=somehost)
-        assert kwargs["_sudo"] == "deploy-kwarg-value"
+        assert kwargs["_sudo"] is True
 
     def test_get_from_kwargs(self):
         config = Config(SUDO="config-value")
-        inventory = Inventory(([("somehost", {"_sudo": "host-value"})], {}))
+        inventory = Inventory(([("somehost", {"_sudo": False})], {}))
         somehost = inventory.get_host("somehost")
 
         state = State(config=config, inventory=inventory)
         somehost.current_deploy_kwargs = {
-            "_sudo": "deploy-kwarg-value",
+            "_sudo": False,
             "_sudo_user": "deploy-kwarg-user",
         }
 
         kwargs, keys = pop_global_arguments(
-            {"_sudo": "kwarg-value"},
+            {"_sudo": True},
             state=state,
             host=somehost,
         )
-        assert kwargs["_sudo"] == "kwarg-value"
+        assert kwargs["_sudo"] is True
         assert kwargs["_sudo_user"] == "deploy-kwarg-user"
         assert "_sudo" in keys

tests/test_api/test_api_deploys.py

@@ -24,7 +24,7 @@ class TestDeploysApi(PatchSSHTestCase):
 
         connect_all(state)
 
-        @deploy
+        @deploy()
         def test_deploy(state=None, host=None):
             server.shell(commands=["echo first command"])
             server.shell(commands=["echo second command"])
@@ -40,20 +40,20 @@ class TestDeploysApi(PatchSSHTestCase):
         run_ops(state)
 
         first_op_hash = op_order[0]
-        assert state.op_meta[first_op_hash].names == {"test_deploy | Server/Shell"}
-        assert state.ops[somehost][first_op_hash].operation_meta.commands == [
+        assert state.op_meta[first_op_hash].names == {"test_deploy | server.shell"}
+        assert state.ops[somehost][first_op_hash].operation_meta._commands == [
             StringCommand("echo first command"),
         ]
-        assert state.ops[anotherhost][first_op_hash].operation_meta.commands == [
+        assert state.ops[anotherhost][first_op_hash].operation_meta._commands == [
             StringCommand("echo first command"),
         ]
 
         second_op_hash = op_order[1]
-        assert state.op_meta[second_op_hash].names == {"test_deploy | Server/Shell"}
-        assert state.ops[somehost][second_op_hash].operation_meta.commands == [
+        assert state.op_meta[second_op_hash].names == {"test_deploy | server.shell"}
+        assert state.ops[somehost][second_op_hash].operation_meta._commands == [
             StringCommand("echo second command"),
         ]
-        assert state.ops[anotherhost][second_op_hash].operation_meta.commands == [
+        assert state.ops[anotherhost][second_op_hash].operation_meta._commands == [
             StringCommand("echo second command"),
         ]
 
@@ -67,10 +67,6 @@ class TestDeploysApi(PatchSSHTestCase):
         assert state.results[somehost].error_ops == 0
         assert state.results[anotherhost].error_ops == 0
 
-        # And with the different modes
-        run_ops(state, serial=True)
-        run_ops(state, no_wait=True)
-
         disconnect_all(state)
 
     def test_nested_deploy(self):
@@ -87,11 +83,11 @@ class TestDeploysApi(PatchSSHTestCase):
 
         connect_all(state)
 
-        @deploy
+        @deploy()
         def test_nested_deploy():
             server.shell(commands=["echo nested command"])
 
-        @deploy
+        @deploy()
         def test_deploy():
             server.shell(commands=["echo first command"])
             test_nested_deploy()
@@ -108,21 +104,21 @@ class TestDeploysApi(PatchSSHTestCase):
         run_ops(state)
 
         first_op_hash = op_order[0]
-        assert state.op_meta[first_op_hash].names == {"test_deploy | Server/Shell"}
-        assert state.ops[somehost][first_op_hash].operation_meta.commands == [
+        assert state.op_meta[first_op_hash].names == {"test_deploy | server.shell"}
+        assert state.ops[somehost][first_op_hash].operation_meta._commands == [
             StringCommand("echo first command"),
         ]
 
         second_op_hash = op_order[1]
         assert state.op_meta[second_op_hash].names == {
-            "test_deploy | test_nested_deploy | Server/Shell",
+            "test_deploy | test_nested_deploy | server.shell",
         }
-        assert state.ops[somehost][second_op_hash].operation_meta.commands == [
+        assert state.ops[somehost][second_op_hash].operation_meta._commands == [
             StringCommand("echo nested command"),
         ]
 
         third_op_hash = op_order[2]
-        assert state.op_meta[third_op_hash].names == {"test_deploy | Server/Shell"}
-        assert state.ops[somehost][third_op_hash].operation_meta.commands == [
+        assert state.op_meta[third_op_hash].names == {"test_deploy | server.shell"}
+        assert state.ops[somehost][third_op_hash].operation_meta._commands == [
             StringCommand("echo second command"),
         ]

tests/test_api/test_api_facts.py

@@ -1,7 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 from pyinfra.api import Config, State
-from pyinfra.api.arguments import get_connector_argument_keys, pop_global_arguments
+from pyinfra.api.arguments import CONNECTOR_ARGUMENT_KEYS, pop_global_arguments
 from pyinfra.api.connect import connect_all
 from pyinfra.api.exceptions import PyinfraError
 from pyinfra.api.facts import get_facts
@@ -17,7 +17,7 @@ def _get_executor_defaults(state, host):
     return {
         key: value
         for key, value in global_argument_defaults.items()
-        if key in get_connector_argument_keys()
+        if key in CONNECTOR_ARGUMENT_KEYS
     }
 
 
@@ -55,7 +55,6 @@ class TestFactsApi(PatchSSHTestCase):
         anotherhost.current_op_global_arguments = {
             "_sudo": True,
             "_sudo_user": "someuser",
-            "_use_sudo_password": True,
             "_su_user": "someuser",
             "_timeout": 10,
             "_env": {"HELLO": "WORLD"},
@@ -237,7 +236,7 @@ class TestFactsApi(PatchSSHTestCase):
 
         assert fact_data == {host_1: "some-output"}
         fake_run_command.assert_called_with(
-            Arch.command,
+            Arch().command(),
             print_input=False,
             print_output=False,
             **defaults,
@@ -310,7 +309,7 @@ class TestHostFactsApi(PatchSSHTestCase):
 
         assert fact_data == "some-output"
         fake_run_command.assert_called_with(
-            Arch.command,
+            Arch().command(),
             print_input=False,
             print_output=False,
             **defaults,

tests/test_api/test_api_operations.py

@@ -29,11 +29,11 @@ from ..util import make_inventory
 class TestOperationMeta(TestCase):
     def test_operation_meta_repr_no_change(self):
         op_meta = OperationMeta("hash", False)
-        assert repr(op_meta) == "OperationMeta(changed=False, hash=hash)"
+        assert repr(op_meta) == "OperationMeta(executed=False, maybeChange=False, hash=hash)"
 
     def test_operation_meta_repr_changes(self):
         op_meta = OperationMeta("hash", True)
-        assert repr(op_meta) == "OperationMeta(changed=True, hash=hash)"
+        assert repr(op_meta) == "OperationMeta(executed=False, maybeChange=True, hash=hash)"
 
 
 class TestOperationsApi(PatchSSHTestCase):
@@ -78,7 +78,7 @@ class TestOperationsApi(PatchSSHTestCase):
         first_op_hash = op_order[0]
 
         # Ensure the op name
-        assert state.op_meta[first_op_hash].names == {"Files/File"}
+        assert state.op_meta[first_op_hash].names == {"files.file"}
 
         # Ensure the global kwargs (same for both hosts)
         somehost_global_arguments = state.ops[somehost][first_op_hash].global_arguments
@@ -97,7 +97,7 @@ class TestOperationsApi(PatchSSHTestCase):
         run_ops(state)
 
         # Ensure the commands
-        assert state.ops[somehost][first_op_hash].operation_meta.commands == [
+        assert state.ops[somehost][first_op_hash].operation_meta._commands == [
             StringCommand("touch /var/log/pyinfra.log"),
             StringCommand("chmod 644 /var/log/pyinfra.log"),
             StringCommand("chown pyinfra:pyinfra /var/log/pyinfra.log"),
@@ -113,10 +113,6 @@ class TestOperationsApi(PatchSSHTestCase):
         assert state.results[somehost].error_ops == 0
         assert state.results[anotherhost].error_ops == 0
 
-        # And with the different modes
-        run_ops(state, serial=True)
-        run_ops(state, no_wait=True)
-
         disconnect_all(state)
 
     @patch("pyinfra.api.util.open", mock_open(read_data="test!"), create=True)
@@ -181,7 +177,7 @@ class TestOperationsApi(PatchSSHTestCase):
         run_ops(state)
 
         # Ensure first op used the right (upload) command
-        assert state.ops[somehost][first_op_hash].operation_meta.commands == [
+        assert state.ops[somehost][first_op_hash].operation_meta._commands == [
             StringCommand("mkdir -p /home/vagrant"),
             FileUploadCommand("files/file.txt", "/home/vagrant/file.txt"),
         ]
@@ -225,7 +221,7 @@ class TestOperationsApi(PatchSSHTestCase):
             run_ops(state)
 
         # Ensure first op has the right (upload) command
-        assert state.ops[somehost][first_op_hash].operation_meta.commands == [
+        assert state.ops[somehost][first_op_hash].operation_meta._commands == [
             FileDownloadCommand("/home/vagrant/file.txt", "files/file.txt"),
         ]
 
@@ -296,7 +292,7 @@ class TestOperationsApi(PatchSSHTestCase):
         fake_run_local_process.assert_called_with(
             (
                 "rsync -ax --delete --rsh "
-                '"ssh -o BatchMode=yes"'
+                '"ssh -o BatchMode=yes -o \\"StrictHostKeyChecking=accept-new\\""'
                 " --rsync-path 'sudo -u root rsync' src vagrant@somehost:dest"
             ),
             print_output=False,
@@ -381,7 +377,8 @@ class TestOperationsApi(PatchSSHTestCase):
         fake_run_local_process.assert_called_with(
             (
                 "rsync -ax --delete --rsh "
-                "\"ssh -o BatchMode=yes -F '/home/me/ssh_test_config && echo hi'\""
+                '"ssh -o BatchMode=yes -o \\"StrictHostKeyChecking=accept-new\\" '
+                "-F '/home/me/ssh_test_config && echo hi'\""
                 " --rsync-path 'sudo -u root rsync' src vagrant@somehost:dest"
             ),
             print_output=False,
@@ -393,7 +390,7 @@ class TestOperationsApi(PatchSSHTestCase):
         state = State(inventory, Config())
         connect_all(state)
 
-        with patch("pyinfra.connectors.ssh.find_executable", lambda x: None):
+        with patch("pyinfra.connectors.ssh.which", lambda x: None):
             with self.assertRaises(OperationError) as context:
                 add_op(state, files.rsync, "src", "dest")
 
@@ -436,11 +433,11 @@ class TestNestedOperationsApi(PatchSSHTestCase):
 
         try:
             outer_result = server.shell(commands="echo outer")
-            assert outer_result.combined_output_lines is None
+            assert outer_result._combined_output is None
 
             def callback():
                 inner_result = server.shell(commands="echo inner")
-                assert inner_result.combined_output_lines is not None
+                assert inner_result._combined_output is not None
 
             python.call(function=callback)
 
@@ -450,7 +447,7 @@ class TestNestedOperationsApi(PatchSSHTestCase):
 
             assert len(state.get_op_order()) == 3
             assert state.results[somehost].success_ops == 3
-            assert outer_result.combined_output_lines is not None
+            assert outer_result._combined_output is not None
 
             disconnect_all(state)
         finally:
@@ -532,18 +529,19 @@ class TestOperationOrdering(PatchSSHTestCase):
         # Add op to just the second host - using the context modules such that
         # it replicates a deploy file.
         ctx_host.set(inventory.get_host("anotherhost"))
-        first_context_hash = server.user("anotherhost_user").hash
+        first_context_hash = server.user("anotherhost_user")._hash
 
         # Add op to just the first host - using the context modules such that
         # it replicates a deploy file.
         ctx_host.set(inventory.get_host("somehost"))
-        second_context_hash = server.user("somehost_user").hash
+        second_context_hash = server.user("somehost_user")._hash
 
         ctx_state.reset()
         ctx_host.reset()
 
         pyinfra.is_cli = False
 
+        print(state.ops)
         # Ensure there are two ops
         op_order = state.get_op_order()
         assert len(op_order) == 3
@@ -567,9 +565,9 @@ class TestOperationOrdering(PatchSSHTestCase):
         another_host = inventory.get_host("anotherhost")
 
         def add_another_op():
-            return add_op(state, server.shell, "echo second-op")[another_host].hash
+            return add_op(state, server.shell, "echo second-op")[another_host]._hash
 
-        first_op_hash = add_op(state, server.shell, "echo first-op")[another_host].hash
+        first_op_hash = add_op(state, server.shell, "echo first-op")[another_host]._hash
         second_op_hash = add_another_op()  # note `add_op` will be called on an earlier line
 
         op_order = state.get_op_order()

tests/test_api/test_api_util.py

@@ -1,6 +1,7 @@
+from io import BytesIO, StringIO
 from unittest import TestCase
 
-from pyinfra.api.util import format_exception, get_caller_frameinfo, try_int
+from pyinfra.api.util import format_exception, get_caller_frameinfo, get_file_io, try_int
 
 
 class TestApiUtil(TestCase):
@@ -15,8 +16,46 @@ class TestApiUtil(TestCase):
             return get_caller_frameinfo()
 
         frameinfo = _get_caller_frameinfo()
-        assert frameinfo.lineno == 17  # called by the line above
+        assert frameinfo.lineno == 18  # called by the line above
 
     def test_format_exception(self):
         exception = Exception("I am a message", 1)
         assert format_exception(exception) == "Exception('I am a message', 1)"
+
+
+class TestApiUtilFileIO(TestCase):
+    def test_get_file_io_stringio_to_string(self):
+        file = StringIO("some string")
+
+        with get_file_io(file, mode="r") as f:
+            data = f.read()
+
+        assert isinstance(data, str)
+        assert data == "some string"
+
+    def test_get_file_io_stringio_to_bytes(self):
+        file = StringIO("some string")
+
+        with get_file_io(file) as f:
+            data = f.read()
+
+        assert isinstance(data, bytes)
+        assert data == b"some string"
+
+    def test_get_file_io_bytesio_to_bytes(self):
+        file = BytesIO(b"some string")
+
+        with get_file_io(file) as f:
+            data = f.read()
+
+        assert isinstance(data, bytes)
+        assert data == b"some string"
+
+    def test_get_file_io_bytesio_to_string(self):
+        file = BytesIO(b"some string")
+
+        with get_file_io(file, mode="r") as f:
+            data = f.read()
+
+        assert isinstance(data, str)
+        assert data == "some string"

tests/test_cli/test_cli.py

@@ -1,7 +1,6 @@
 from os import path
 from unittest import TestCase
 
-from pyinfra.context import ctx_state
 from pyinfra_cli.main import _main
 
 from ..paramiko_util import PatchSSHTestCase
@@ -17,23 +16,10 @@ class TestCliEagerFlags(TestCase):
         assert result.exit_code == 0, result.stdout
 
 
-class TestDeployCli(PatchSSHTestCase):
-    def setUp(self):
-        ctx_state.reset()
-
-    def test_invalid_deploy(self):
-        result = run_cli(
-            "@local",
-            "not-a-file.py",
-        )
-        assert result.exit_code == 1, result.stdout
-        assert "No deploy file: not-a-file.py" in result.stdout
-
-
 class TestOperationCli(PatchSSHTestCase):
     def test_invalid_operation_module(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "not_a_module.shell",
         )
         assert result.exit_code == 1, result.stdout
@@ -41,7 +27,7 @@ class TestOperationCli(PatchSSHTestCase):
 
     def test_invalid_operation_function(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "server.not_an_operation",
         )
         assert result.exit_code == 1, result.stdout
@@ -50,7 +36,7 @@ class TestOperationCli(PatchSSHTestCase):
     def test_deploy_operation(self):
         result = run_cli(
             "-y",
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "server.shell",
             "echo hi",
         )
@@ -59,7 +45,7 @@ class TestOperationCli(PatchSSHTestCase):
     def test_deploy_operation_with_all(self):
         result = run_cli(
             "-y",
-            path.join("tests", "deploy", "inventory_all.py"),
+            path.join("tests", "test_cli", "deploy", "inventory_all.py"),
             "server.shell",
             "echo hi",
         )
@@ -68,7 +54,7 @@ class TestOperationCli(PatchSSHTestCase):
     def test_deploy_operation_json_args(self):
         result = run_cli(
             "-y",
-            path.join("tests", "deploy", "inventory_all.py"),
+            path.join("tests", "test_cli", "deploy", "inventory_all.py"),
             "server.shell",
             '[["echo hi"], {}]',
         )
@@ -78,7 +64,7 @@ class TestOperationCli(PatchSSHTestCase):
 class TestFactCli(PatchSSHTestCase):
     def test_get_fact(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "fact",
             "server.Os",
         )
@@ -87,7 +73,7 @@ class TestFactCli(PatchSSHTestCase):
 
     def test_get_fact_with_kwargs(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "fact",
             "files.File",
             "path=.",
@@ -95,29 +81,11 @@ class TestFactCli(PatchSSHTestCase):
         assert result.exit_code == 0, result.stdout
         assert '"somehost": null' in result.stdout
 
-    def test_invalid_fact_module(self):
-        result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
-            "fact",
-            "not_a_module.NotAFact",
-        )
-        assert result.exit_code == 1, result.stdout
-        assert "No such module: pyinfra.facts.not_a_module" in result.stdout
-
-    def test_invalid_fact_class(self):
-        result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
-            "fact",
-            "server.NotAFact",
-        )
-        assert result.exit_code == 1, result.stdout
-        assert "No such attribute in module pyinfra.facts.server: NotAFact" in result.stdout
-
 
 class TestExecCli(PatchSSHTestCase):
     def test_exec_command(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--",
             "echo hi",
@@ -126,7 +94,7 @@ class TestExecCli(PatchSSHTestCase):
 
     def test_exec_command_with_options(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--sudo",
             "--sudo-user",
@@ -144,7 +112,7 @@ class TestExecCli(PatchSSHTestCase):
 
     def test_exec_command_with_serial(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--serial",
             "--",
@@ -154,7 +122,7 @@ class TestExecCli(PatchSSHTestCase):
 
     def test_exec_command_with_no_wait(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--no-wait",
             "--",
@@ -164,7 +132,7 @@ class TestExecCli(PatchSSHTestCase):
 
     def test_exec_command_with_debug_operations(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--debug-operations",
             "--",
@@ -174,7 +142,7 @@ class TestExecCli(PatchSSHTestCase):
 
     def test_exec_command_with_debug_facts(self):
         result = run_cli(
-            path.join("tests", "deploy", "inventories", "inventory.py"),
+            path.join("tests", "test_cli", "deploy", "inventories", "inventory.py"),
             "exec",
             "--debug-facts",
             "--",
@@ -213,15 +181,11 @@ class TestDirectMainExecution(PatchSSHTestCase):
                 limit=None,
                 no_wait=False,
                 serial=False,
-                winrm_username=None,
-                winrm_password=None,
-                winrm_port=None,
-                winrm_transport=None,
                 shell_executable=None,
-                quiet=False,
                 data=tuple(),
                 debug=False,
                 debug_facts=False,
+                debug_all=False,
                 debug_operations=False,
                 config_filename="config.py",
             )