Merge branch 'master' into schema-alteration

2 files changed, 24 insertions, 0 deletions

diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py
index 3161c04f97..5829e7c2d7 100644
--- a/tests/utils_tests/test_datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -203,6 +203,21 @@ class MergeDictTests(SimpleTestCase):
                            ('key2', ['value2', 'value3']),
                            ('key4', ['value5', 'value6'])])
 
+    def test_bool_casting(self):
+        empty = MergeDict({}, {}, {})
+        not_empty = MergeDict({}, {}, {"key": "value"})
+        self.assertFalse(empty)
+        self.assertTrue(not_empty)
+
+    def test_key_error(self):
+        """
+        Test that the message of KeyError contains the missing key name.
+        """
+        d1 = MergeDict({'key1': 42})
+        with six.assertRaisesRegex(self, KeyError, 'key2'):
+            d1['key2']
+
+
 class MultiValueDictTests(SimpleTestCase):
 
     def test_multivaluedict(self):
diff --git a/tests/utils_tests/test_simplelazyobject.py b/tests/utils_tests/test_simplelazyobject.py
index 883e60aa81..f925e01eb6 100644
--- a/tests/utils_tests/test_simplelazyobject.py
+++ b/tests/utils_tests/test_simplelazyobject.py
@@ -152,3 +152,12 @@ class TestUtilsSimpleLazyObject(TestCase):
             SimpleLazyObject(None)
         finally:
             sys.settrace(old_trace_func)
+
+    def test_not_equal(self):
+        lazy1 = SimpleLazyObject(lambda: 2)
+        lazy2 = SimpleLazyObject(lambda: 2)
+        lazy3 = SimpleLazyObject(lambda: 3)
+        self.assertEqual(lazy1, lazy2)
+        self.assertNotEqual(lazy1, lazy3)
+        self.assertTrue(lazy1 != lazy3)
+        self.assertFalse(lazy1 != lazy2)