Rename SaltMaster.get_salt_cli to SaltMaster.salt_cli

Forgotten in saltstack#50

changelog/70.breaking.rst

@@ -0,0 +1 @@
+Rename the ``SaltMaster.get_salt_cli`` to ``SaltMaster.salt_cli``, forgotten on `#50 <https://github.com/saltstack/pytest-salt-factories/issues/50>`_

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

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,

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)

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()

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

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

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")