Merge branch 'main' into flux-control-lora

Author: sayakpaul

tests/single_file/test_stable_diffusion_upscale_single_file.py

@@ -1,6 +1,7 @@
 import gc
 import unittest
 
+import pytest
 import torch
 
 from diffusers import (
@@ -68,3 +69,19 @@ def test_single_file_format_inference_is_same_as_pretrained(self):
         assert (
             numpy_cosine_similarity_distance(image_from_pretrained.flatten(), image_from_single_file.flatten()) < 1e-3
         )
+
+    @pytest.mark.xfail(
+        condition=True,
+        reason="Test fails because of mismatches in the configs but it is very hard to properly fix this considering downstream usecase.",
+        strict=True,
+    )
+    def test_single_file_components_with_original_config(self):
+        super().test_single_file_components_with_original_config()
+
+    @pytest.mark.xfail(
+        condition=True,
+        reason="Test fails because of mismatches in the configs but it is very hard to properly fix this considering downstream usecase.",
+        strict=True,
+    )
+    def test_single_file_components_with_original_config_local_files_only(self):
+        super().test_single_file_components_with_original_config_local_files_only()