From 393dac9e8c0a7c7cd419706ba75ba13dc6aafd99 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 17 Jun 2021 11:32:50 +0100 Subject: [PATCH] Rename `SaltMaster.get_salt_cli` to `SaltMaster.salt_cli` Forgotten in #50 --- changelog/70.breaking.rst | 1 + examples/echo-extension/tests/integration/conftest.py | 2 +- src/saltfactories/daemons/master.py | 4 ++-- tests/functional/factories/cli/test_salt.py | 2 +- tests/integration/factories/cli/conftest.py | 2 +- tests/integration/factories/daemons/minion/test_minion.py | 2 +- .../integration/factories/daemons/proxy/test_proxy_minion.py | 2 +- tests/integration/factories/daemons/syndic/test_syndic.py | 4 ++-- 8 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 changelog/70.breaking.rst diff --git a/changelog/70.breaking.rst b/changelog/70.breaking.rst new file mode 100644 index 00000000..e4d406fe --- /dev/null +++ b/changelog/70.breaking.rst @@ -0,0 +1 @@ +Rename the ``SaltMaster.get_salt_cli`` to ``SaltMaster.salt_cli``, forgotten on `#50 `_ diff --git a/examples/echo-extension/tests/integration/conftest.py b/examples/echo-extension/tests/integration/conftest.py index db92ba80..9bd94587 100644 --- a/examples/echo-extension/tests/integration/conftest.py +++ b/examples/echo-extension/tests/integration/conftest.py @@ -20,7 +20,7 @@ def salt_run_cli(master): @pytest.fixture def salt_cli(master): - return master.get_salt_cli() + return master.salt_cli() @pytest.fixture diff --git a/src/saltfactories/daemons/master.py b/src/saltfactories/daemons/master.py index a1eb161f..fc802189 100644 --- a/src/saltfactories/daemons/master.py +++ b/src/saltfactories/daemons/master.py @@ -360,7 +360,7 @@ def salt_cloud_cli( **factory_class_kwargs ) - def get_salt_cli(self, factory_class=cli.salt.Salt, **factory_class_kwargs): + def salt_cli(self, factory_class=cli.salt.Salt, **factory_class_kwargs): """ Return a `salt` CLI process for this master instance """ @@ -508,7 +508,7 @@ def salt_ssh_cli( **factory_class_kwargs ) - def get_salt_client( + def salt_client( self, functions_known_to_return_none=None, factory_class=client.LocalClient, diff --git a/tests/functional/factories/cli/test_salt.py b/tests/functional/factories/cli/test_salt.py index e626e0e9..f89f0424 100644 --- a/tests/functional/factories/cli/test_salt.py +++ b/tests/functional/factories/cli/test_salt.py @@ -8,7 +8,7 @@ def test_version_info(salt_master, salt_version): - cli = salt_master.get_salt_cli() + cli = salt_master.salt_cli() ret = cli.run("--version") assert ret.exitcode == 0, ret assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version) diff --git a/tests/integration/factories/cli/conftest.py b/tests/integration/factories/cli/conftest.py index 080dc51c..30808524 100644 --- a/tests/integration/factories/cli/conftest.py +++ b/tests/integration/factories/cli/conftest.py @@ -38,4 +38,4 @@ def salt_minion(salt_factories, minion_id, salt_master): @pytest.fixture(scope="package") def salt_cli(salt_master): - return salt_master.get_salt_cli() + return salt_master.salt_cli() diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py index d5406cbf..8e73efc7 100644 --- a/tests/integration/factories/daemons/minion/test_minion.py +++ b/tests/integration/factories/daemons/minion/test_minion.py @@ -19,7 +19,7 @@ def minion(master): @pytest.fixture def salt_cli(master): - return master.get_salt_cli() + return master.salt_cli() @pytest.fixture diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py index 45f209c8..926e6ac6 100644 --- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py +++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py @@ -27,7 +27,7 @@ def proxy_minion(master): @pytest.fixture def salt_cli(master): - return master.get_salt_cli() + return master.salt_cli() @pytest.fixture diff --git a/tests/integration/factories/daemons/syndic/test_syndic.py b/tests/integration/factories/daemons/syndic/test_syndic.py index 7a343abe..23fe5f04 100644 --- a/tests/integration/factories/daemons/syndic/test_syndic.py +++ b/tests/integration/factories/daemons/syndic/test_syndic.py @@ -81,7 +81,7 @@ def master_of_masters_salt_cli(master_of_masters, minion_1): """ assert master_of_masters.is_running() assert minion_1.is_running() - return master_of_masters.get_salt_cli() + return master_of_masters.salt_cli() @pytest.fixture(scope="module") @@ -93,7 +93,7 @@ def syndic_master_salt_cli(syndic_master, syndic_minion, minion_2): assert syndic_master.is_running() assert syndic_minion.is_running() assert minion_2.is_running() - return syndic_master.get_salt_cli() + return syndic_master.salt_cli() @pytest.fixture(scope="module")