From a07de92427c318931efd642bcda0073b558e3781 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Thu, 27 Jan 2022 11:11:58 +0100
Subject: [PATCH] conftest: get_marker has been renamed to get_closest_marker

---
 conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index e442eb316..8a1970e6e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -74,6 +74,6 @@ def user_instance(request, admin_user):
 
 @pytest.fixture(autouse=True)
 def has_git_requirements(request, project_root):
-    if request.node.get_marker('has_git_requirements'):
+    if request.node.get_closest_marker('has_git_requirements'):
         if not os.path.exists(os.path.join(project_root, '.git', 'refs', 'heads', 'master')):
             pytest.skip('skipped test as project is not a git repo')