Merge remote-tracking branch 'origin/dev' into CLIENT-3106-map-err-co…

…de-to-exc

VERSION

@@ -1 +1 @@
-15.0.1rc5.dev3
+15.0.1rc5.dev5

src/main/exception.c

@@ -338,6 +338,7 @@ PyObject *AerospikeException_New(void)
 
         PyObject *py_code = NULL;
         if (exception_def.code == NO_ERROR_CODE) {
+            Py_INCREF(Py_None);
             py_code = Py_None;
         }
         else {

test/new_tests/test_index.py

@@ -245,11 +245,14 @@ def test_create_string_index_with_correct_parameters_ns_length_extra(self):
         ns_name = "a" * 50
         policy = {}
 
-        with pytest.raises(e.InvalidRequest) as err_info:
+        with pytest.raises((e.InvalidRequest, e.NamespaceNotFound)) as err_info:
             self.as_connection.index_string_create(ns_name, "demo", "name", "name_index", policy)
 
         err_code = err_info.value.code
-        assert err_code is AerospikeStatus.AEROSPIKE_ERR_REQUEST_INVALID
+        if (TestBaseClass.major_ver, TestBaseClass.minor_ver) >= (7, 2):
+            assert err_code is AerospikeStatus.AEROSPIKE_ERR_NAMESPACE_NOT_FOUND
+        else:
+            assert err_code is AerospikeStatus.AEROSPIKE_ERR_REQUEST_INVALID
 
     def test_create_string_index_with_incorrect_namespace(self):
         """

test/new_tests/test_mapkeys_index.py

@@ -121,16 +121,19 @@ def test_mapkeysindex_with_correct_parameters_string_on_numerickeys(self):
         ),
         ids=("ns too long", "set too long", "bin too long", "index name too long"),
     )
-    def test_mapkeys_with_parameters_too_long(self, ns, test_set, test_bin, index_name):
+    def test_mapkeys_with_parameters_too_long(self, ns, test_set, test_bin, index_name, request):
         # Invoke index_map_keys_create() with correct arguments and set
         # length extra
         policy = {}
 
-        with pytest.raises(e.InvalidRequest) as err_info:
+        with pytest.raises((e.InvalidRequest, e.NamespaceNotFound)) as err_info:
             self.as_connection.index_map_keys_create(ns, test_set, test_bin, aerospike.INDEX_STRING, index_name, policy)
 
         err_code = err_info.value.code
-        assert err_code == AerospikeStatus.AEROSPIKE_ERR_REQUEST_INVALID
+        if request.node.callspec.id == "ns too long" and (TestBaseClass.major_ver, TestBaseClass.minor_ver) >= (7, 2):
+            assert err_code is AerospikeStatus.AEROSPIKE_ERR_NAMESPACE_NOT_FOUND
+        else:
+            assert err_code is AerospikeStatus.AEROSPIKE_ERR_REQUEST_INVALID
 
     def test_mapkeysindex_with_incorrect_namespace(self):
         """