Put channel tests under channel not transport

tests/pytests/functional/channel/conftest.py

@@ -2,6 +2,7 @@ import ctypes
 import multiprocessing
 
 import pytest
+from saltfactories.utils import random_string
 
 import salt.crypt
 import salt.master
@@ -24,3 +25,43 @@ def _prepare_aes():
     finally:
         if old_aes:
             salt.master.SMaster.secrets["aes"] = old_aes
+
+
+def transport_ids(value):
+    return "Transport({})".format(value)
+
+
+@pytest.fixture(params=("zeromq", "tcp"), ids=transport_ids)
+def transport(request):
+    return request.param
+
+
+@pytest.fixture
+def salt_master(salt_factories, transport):
+    config_defaults = {
+        "transport": transport,
+        "auto_accept": True,
+        "sign_pub_messages": False,
+    }
+    factory = salt_factories.salt_master_daemon(
+        random_string("server-{}-master-".format(transport)),
+        defaults=config_defaults,
+    )
+    return factory
+
+
+@pytest.fixture
+def salt_minion(salt_master, transport):
+    config_defaults = {
+        "transport": transport,
+        "master_ip": "127.0.0.1",
+        "master_port": salt_master.config["ret_port"],
+        "auth_timeout": 5,
+        "auth_tries": 1,
+        "master_uri": "tcp://127.0.0.1:{}".format(salt_master.config["ret_port"]),
+    }
+    factory = salt_master.salt_minion_daemon(
+        random_string("server-{}-minion-".format(transport)),
+        defaults=config_defaults,
+    )
+    return factory

tests/pytests/functional/transport/server/conftest.py

@@ -1,42 +0,0 @@
-import pytest
-from saltfactories.utils import random_string
-
-
-def transport_ids(value):
-    return "Transport({})".format(value)
-
-
-@pytest.fixture(params=("zeromq", "tcp"), ids=transport_ids)
-def transport(request):
-    return request.param
-
-
-@pytest.fixture
-def salt_master(salt_factories, transport):
-    config_defaults = {
-        "transport": transport,
-        "auto_accept": True,
-        "sign_pub_messages": False,
-    }
-    factory = salt_factories.salt_master_daemon(
-        random_string("server-{}-master-".format(transport)),
-        defaults=config_defaults,
-    )
-    return factory
-
-
-@pytest.fixture
-def salt_minion(salt_master, transport):
-    config_defaults = {
-        "transport": transport,
-        "master_ip": "127.0.0.1",
-        "master_port": salt_master.config["ret_port"],
-        "auth_timeout": 5,
-        "auth_tries": 1,
-        "master_uri": "tcp://127.0.0.1:{}".format(salt_master.config["ret_port"]),
-    }
-    factory = salt_master.salt_minion_daemon(
-        random_string("server-{}-minion-".format(transport)),
-        defaults=config_defaults,
-    )
-    return factory