Swapping out "from saltfactories.factories.daemons.container import ContainerFactory" for "from saltfactories.daemons.container import Container". Updating warning to use reason instead of warning.

tests/pytests/functional/states/rabbitmq/conftest.py

@@ -3,7 +3,7 @@ import time
 
 import attr
 import pytest
-from saltfactories.factories.daemons.container import ContainerFactory
+from saltfactories.daemons.container import Container
 from saltfactories.utils import random_string
 from saltfactories.utils.ports import get_unused_localhost_port
 
@@ -59,7 +59,7 @@ def rabbitmq_container(request, salt_factories, modules):
         docker_client = docker.from_env()
     except docker_errors.DockerException:
         pytest.skip("Failed to get a connection to docker running on the system")
-    connectable = ContainerFactory.client_connectable(docker_client)
+    connectable = Container.client_connectable(docker_client)
     if connectable is not True:  # pragma: no cover
         pytest.skip(connectable)
 

tests/pytests/functional/states/rabbitmq/test_cluster.py

@@ -14,7 +14,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]
 

tests/pytests/functional/states/rabbitmq/test_plugin.py

@@ -15,7 +15,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]
 

tests/pytests/functional/states/rabbitmq/test_policy.py

@@ -15,7 +15,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]
 

tests/pytests/functional/states/rabbitmq/test_upstream.py

@@ -14,7 +14,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]
 

tests/pytests/functional/states/rabbitmq/test_user.py

@@ -14,7 +14,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]
 

tests/pytests/functional/states/rabbitmq/test_vhost.py

@@ -14,7 +14,7 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.skip_on_freebsd(reason="No Docker on FreeBSD available"),
     pytest.mark.skip_if_binaries_missing(
-        "docker", "dockerd", message="Docker not installed"
+        "docker", "dockerd", reason="Docker not installed"
     ),
 ]