From 1ef641406a4a5510b26f56ed457ddcf72a527312 Mon Sep 17 00:00:00 2001 From: Longze Chen Date: Thu, 3 Oct 2024 14:44:39 -0400 Subject: [PATCH] Fix unit test failure caused by merge conflicts --- api_tests/files/views/test_file_detail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api_tests/files/views/test_file_detail.py b/api_tests/files/views/test_file_detail.py index a80b9319dae..01f7da21a26 100644 --- a/api_tests/files/views/test_file_detail.py +++ b/api_tests/files/views/test_file_detail.py @@ -31,7 +31,7 @@ SessionStore = import_module(django_conf_settings.SESSION_ENGINE).SessionStore -from addons.base.views import get_authenticated_resource +from addons.base.views import _get_authenticated_resource from framework.exceptions import HTTPError # stolen from^W^Winspired by DRF @@ -769,7 +769,7 @@ def test_get_authenticated_resource_retracted(self): assert resource.is_retracted is True with pytest.raises(HTTPError) as excinfo: - get_authenticated_resource(resource._id) + _get_authenticated_resource(resource._id) assert excinfo.value.code == 410