From 12f5c39a4477e7792bac481e4ef29746080d8d04 Mon Sep 17 00:00:00 2001 From: m-cahill Date: Sun, 8 Mar 2026 20:27:24 -0700 Subject: [PATCH] fix: remove merge conflict markers from test_api_extended.py (#10) Made-with: Cursor --- test/quality/test_api_extended.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/test/quality/test_api_extended.py b/test/quality/test_api_extended.py index da96a50a4..f18ce9dd5 100644 --- a/test/quality/test_api_extended.py +++ b/test/quality/test_api_extended.py @@ -17,15 +17,6 @@ def test_get_api_endpoint(base_url, url): assert requests.get(f"{base_url}/{url}").status_code == 200 -<<<<<<< HEAD -======= -def test_interrogate_deepbooru(base_url, img2img_basic_image_base64): - """Interrogate with deepbooru model.""" - payload = {"image": img2img_basic_image_base64, "model": "deepbooru"} - assert requests.post(f"{base_url}/sdapi/v1/interrogate", json=payload).status_code == 200 - - ->>>>>>> origin/main def test_png_info(base_url, img2img_basic_image_base64): """PNG info endpoint.""" payload = {"image": img2img_basic_image_base64}