Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I56b8450c17fd83a24ee2ec9eb8f66f3530caba6c

2 files changed, 20 insertions, 0 deletions

diff --git a/sources/shiboken2/tests/samplebinding/objecttype_test.py b/sources/shiboken2/tests/samplebinding/objecttype_test.py
index bda14c69c..f1a06c2b1 100644
--- a/sources/shiboken2/tests/samplebinding/objecttype_test.py
+++ b/sources/shiboken2/tests/samplebinding/objecttype_test.py
@@ -118,5 +118,13 @@ class ObjectTypeTest(unittest.TestCase):
 
         self.assertLess(abs(before - after), 5)
 
+    def testInvalidProperty(self):
+        o = ObjectType()
+        try:
+            o.typo
+            self.assertFail()
+        except AttributeError as error:
+            self.assertEqual(error.args[0], "'sample.ObjectType' object has no attribute 'typo'")
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py b/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
index e07856e61..e1883c7cc 100644
--- a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
+++ b/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
@@ -175,5 +175,17 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(len(ptrToObjList), 0)
         self.assertEqual(objCount(), 1)
 
+    def testInvalidParameter(self):
+        # Create Obj.
+        o = Obj()
+        # Create a shared pointer to an Obj together with an Obj.
+        ptrToObj = o.giveSharedPtrToObj()
+        try:
+            ptrToObj.typo
+            self.assertFail()
+        except AttributeError as error:
+            self.assertEqual(error.args[0], "'smart.SharedPtr_Obj' object has no attribute 'typo'")
+
+
 if __name__ == '__main__':
     unittest.main()