From bca0372e738f75e7420de6244f5c7d38ae871fa2 Mon Sep 17 00:00:00 2001
From: Zach Moody <zmoody@digitalocean.com>
Date: Mon, 5 Apr 2021 14:47:37 -0500
Subject: [PATCH] Move dependency binary checks

Moving checks for git and docker binaries to the functions that should use them first.
---
 tests/integration/conftest.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index ae9c657f..1fd96faf 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -52,6 +52,10 @@ def git_toplevel():
         str: The path of the top level directory of the current git repo.
 
     """
+    try:
+        subp.check_call(["which", "git"])
+    except subp.CalledProcessError:
+        pytest.skip(msg="git executable was not found on the host")
     return (
         subp.check_output(["git", "rev-parse", "--show-toplevel"])
         .decode("utf-8")
@@ -73,6 +77,10 @@ def netbox_docker_repo_dirpaths(pytestconfig, git_toplevel):
                     ]
                 }
     """
+    try:
+        subp.check_call(["which", "docker"])
+    except subp.CalledProcessError:
+        pytest.skip(msg="docker executable was not found on the host")
     netbox_versions_by_repo_dirpaths = {}
     for netbox_version in pytestconfig.option.netbox_versions:
         repo_version_tag = get_netbox_docker_version_tag(netbox_version=netbox_version)
@@ -196,11 +204,6 @@ def docker_compose_file(pytestconfig, netbox_docker_repo_dirpaths):
     clean_netbox_docker_tmpfiles()
     clean_docker_objects()
 
-    try:
-        subp.check_call(["which", "docker"])
-    except subp.CalledProcessError:
-        pytest.skip(msg="docker executable was not found on the host")
-
     compose_files = []
 
     for (