Ticket #29226: test_modify_settings.patch

tests/settings_tests/tests.py

@@ -2 +2 @@
 import sys
 import unittest
 import warnings
+from collections import OrderedDict
 from types import ModuleType
 from unittest import mock
 
@@ -48 +49 @@
     def test_method_list_override_no_ops(self):
         self.assertEqual(settings.ITEMS, ['b', 'd'])
 
+    @modify_settings(ITEMS={
+        'append': ['a', 'e'],
+        'remove': ['a', 'c', 'e'],
+    })
+    def test_method_list_append_remove_same_values(self):
+        # This test fails randomly in Python < 3.6 since dictionaries
+        # doesn't have "insert ordering" as in Python >= 3.6
+
+        # This test fails in Python >= 3.6 since it has "insert
+        # ordering" and we are first appending the items and then
+        # removing them
+        self.assertEqual(settings.ITEMS, ['b', 'd', 'a', 'e'])
+
+    @modify_settings(ITEMS={
+        'remove': ['a', 'c', 'e'],
+        'append': ['a', 'e'],
+    })
+    def test_method_list_remove_append_same_values(self):
+        # This test fails randomly in Python < 3.6 since dictionaries
+        # doesn't have "insert ordering" as in Python >= 3.6.
+
+        # This test passes in Python >= 3.6 since it has "insert
+        # ordering" and we are first removing the items and then
+        # appending them
+        self.assertEqual(settings.ITEMS, ['b', 'd', 'a', 'e'])
+
+    @modify_settings(ITEMS={
+        'remove': ['a', 'c', 'e'],
+    })
+    @modify_settings(ITEMS={
+        'append': ['a', 'e'],
+    })
+    def test_method_list_append_remove_same_values_twice_decorated(self):
+        self.assertEqual(settings.ITEMS, ['b', 'd', 'a', 'e'])
+
+    @unittest.expectedFailure
+    @modify_settings(ITEMS=OrderedDict([
+        ('append', ['a', 'e']),
+        ('remove', ['a', 'c', 'e']),
+    ]))
+    def test_method_list_append_remove_same_values_ordereddict(self):
+        # This test fail because it first appends the items and then
+        # removes them
+        self.assertEqual(settings.ITEMS, ['b', 'd', 'a', 'e'])
+
+    @modify_settings(ITEMS=OrderedDict([
+        ('remove', ['a', 'c', 'e']),
+        ('append', ['a', 'e']),
+    ]))
+    def test_method_list_remove_append_same_values_ordereddict(self):
+        # This test pass because it first removes the items and then
+        # appends them
+        self.assertEqual(settings.ITEMS, ['b', 'd', 'a', 'e'])
+
     @modify_settings(ITEMS={
         'append': 'e',
         'prepend': 'a',