diff options
| author | Nick Pope <nick@nickpope.me.uk> | 2021-03-08 13:27:19 +0000 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-19 06:33:39 +0100 |
| commit | 1e62a6420230c512b78433265ae8003f27c6eaeb (patch) | |
| tree | dddc821551c833a46958c03ba2d797f7475edf52 /tests/forms_tests | |
| parent | 1282b5e4207440af659ef0e0e0c486fdfba8e7b7 (diff) | |
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.
Diffstat (limited to 'tests/forms_tests')
| -rw-r--r-- | tests/forms_tests/tests/test_media.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): """ |