skip if no docker and fix failing test

tests/pytests/functional/utils/test_etcd_util.py

@@ -15,6 +15,7 @@ log = logging.getLogger(__name__)
 pytestmark = [
     pytest.mark.windows_whitelisted,
     pytest.mark.skipif(not HAS_LIBS, reason="Need etcd libs to test etcd_util!"),
+    pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
 ]
 
 

tests/pytests/unit/utils/test_etcd_util.py

@@ -90,9 +90,6 @@ def test_get():
             assert client.get("salt") == "stack"
             mock.assert_called_with("salt", recursive=False)
 
-            assert client.get("salt", recurse=True) == "stack"
-            mock.assert_called_with("salt", recursive=True)
-
             # iter(list(Exception)) works correctly with both mock<1.1 and mock>=1.1
             mock.side_effect = iter([etcd.EtcdKeyNotFound()])
             assert client.get("not-found") is None
@@ -108,6 +105,12 @@ def test_get():
             with pytest.raises(Exception):
                 client.get("some-error")
 
+        # Get with recurse now delegates to client.tree
+        with patch.object(client, "tree", autospec=True) as tree_mock:
+            tree_mock.return_value = {"salt": "stack"}
+            assert client.get("salt", recurse=True) == {"salt": "stack"}
+            tree_mock.assert_called_with("salt")
+
 
 def test_tree():
     """