f

saltstack · Apr 15, 2021 · 09d1027 · 09d1027
1 parent b914745
commit 09d1027
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 28 deletions.
diff --git a/src/saltfactories/daemons/master.py b/src/saltfactories/daemons/master.py
@@ -41,7 +41,9 @@ def __attrs_post_init__(self):
                 auth_event_callback = partial(self.on_auth_event_callback, self)
             else:
                 auth_event_callback = self._on_auth_event
-            self.before_start(self.event_listener.auth_event_handler, self.id, auth_event_callback)
+            self.before_start(
+                self.event_listener.register_auth_event_handler, self.id, auth_event_callback
+            )
             self.after_terminate(self.event_listener.unregister_auth_event_handler, self.id)
 
     @state_tree.default

diff --git a/tests/functional/factories/cli/test_call.py b/tests/functional/factories/cli/test_call.py
@@ -11,12 +11,8 @@ def test_version_info(salt_minion, salt_proxy_minion, salt_version):
     cli = salt_minion.get_salt_call_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
     cli = salt_proxy_minion.get_salt_call_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_cloud.py b/tests/functional/factories/cli/test_cloud.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_cloud_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_cp.py b/tests/functional/factories/cli/test_cp.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_cp_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_key.py b/tests/functional/factories/cli/test_key.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_key_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_run.py b/tests/functional/factories/cli/test_run.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_run_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_salt.py b/tests/functional/factories/cli/test_salt.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_spm.py b/tests/functional/factories/cli/test_spm.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_spm_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)
diff --git a/tests/functional/factories/cli/test_ssh.py b/tests/functional/factories/cli/test_ssh.py
@@ -11,6 +11,4 @@ def test_version_info(salt_master, salt_version):
     cli = salt_master.get_salt_ssh_cli()
     ret = cli.run("--version")
     assert ret.exitcode == 0, ret
-    assert ret.stdout.strip() == "{} {}".format(
-        pathlib.Path(cli.cli_script_name).name, salt_version
-    )
+    assert ret.stdout.strip() == "{} {}".format(pathlib.Path(cli.script_name).name, salt_version)