forgot to update tests after removing methods from stub

Xpra-org · Jan 30, 2025 · 1205207 · 1205207
1 parent 232913b
commit 1205207
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/tests/unittests/unit/server/mixins/stub_mixin_test.py b/tests/unittests/unit/server/mixins/stub_mixin_test.py
@@ -6,7 +6,6 @@
 
 import unittest
 
-from xpra.common import noop
 from xpra.util.objects import typedict, AdHocStruct
 from xpra.util.thread import start_thread
 from xpra.server.mixins.stub_server_mixin import StubServerMixin
@@ -24,13 +23,6 @@ def test_mixin_methods(self):
         t = start_thread(x.threaded_setup, "threaded setup")
         t.join()
         x.init_packet_handlers()
-        x.add_packet_handler("foo", noop, main_thread=True)
-        x.add_packet_handler("bar", noop, main_thread=False)
-        x.add_packet_handlers({
-            "hello": noop,
-            "world": noop,
-        }, main_thread=True)
-
         x.get_server_source(None)
 
         assert isinstance(x.get_caps(None), dict)

diff --git a/xpra/scripts/server.py b/xpra/scripts/server.py
@@ -349,7 +349,7 @@ def enforce_server_features() -> None:
         "fileprint": "xpra.server.mixins.fileprint,xpra.server.source.fileprint",
         "mmap": "xpra.net.mmap,xpra.server.mixins.mmap,xpra.server.source.mmap",
         "ssl": "ssl,xpra.net.ssl_util",
-        "ssh": "paramiko,xpra.net.ssh",
+        "ssh": "paramiko,xpra.net.ssh,xpra.server.mixins.ssh_agent",
         "input_devices": "xpra.server.mixins.input,xpra.server.source.input",
         "gstreamer": "gi.repository.Gst,xpra.gstreamer,xpra.codecs.gstreamer",
         "x11": "xpra.x11,gi.repository.GdkX11",