From 1e62a6420230c512b78433265ae8003f27c6eaeb Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Mon, 8 Mar 2021 13:27:19 +0000 Subject: Refs #32528 -- Simplified Media.merge(). This avoids building up a second datastructure for the duplicate files warning case and simply flatten and strip duplicates if that case ever arises. --- tests/forms_tests/tests/test_media.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/forms_tests') diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py index aa508cb415..061adc09ca 100644 --- a/tests/forms_tests/tests/test_media.py +++ b/tests/forms_tests/tests/test_media.py @@ -606,7 +606,7 @@ class FormsMediaTestCase(SimpleTestCase): def test_merge_warning(self): msg = "Detected duplicate Media files in an opposite order: [1, 2], [2, 1]" with self.assertWarnsMessage(RuntimeWarning, msg): - self.assertEqual(Media.merge([1, 2], [2, 1]), [1, 2]) + self.assertEqual(Media.merge([1, 2], [2, 1], None), [1, 2]) def test_merge_js_three_way(self): """ -- cgit v1.3