fix merge

astronomer · Dec 2, 2023 · 8119dd1 · 8119dd1
2 parents 0c4c83f + 26518d0
commit 8119dd1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tests/plugin/test_plugin.py b/tests/plugin/test_plugin.py
@@ -12,7 +12,11 @@
 
 
 @pytest.fixture(scope="module")
+<<<<<<< HEAD
 @patch("airflow.www.auth.managers.fab.fab_auth_manager.FabAuthManager.get_user")
+=======
+@patch("airflow.auth.managers.fab.fab_auth_manager.FabAuthManager.get_user")
+>>>>>>> 26518d01e47c4b9017fd4a52f887cd528893dcef
 def app(mock_user) -> FlaskClient:
     initdb()
 
@@ -24,7 +28,7 @@ def app(mock_user) -> FlaskClient:
         appbuilder.register_blueprint(dbt_docs_view)
 
     if not appbuilder.sm.find_role("pytest_role"):
-        appbuilder.sm.add_role("pytest_role", permissions=[(permissions.ACTION_CAN_READ, )])
+        appbuilder.sm.add_role("pytest_role", permissions=[(permissions.ACTION_CAN_READ,)])
 
     if not appbuilder.sm.find_user("pytest_user"):
         mock_user.return_value = appbuilder.sm.add_user(