FINERACT-2525 accept MariaDB snapshot isolation conflict responses in savings integration tests

Author: siva-sai-udaygiri

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountTransactionTest.java

@@ -381,8 +381,13 @@ public void run() {
                 assertNotNull(responses, "Responses");
                 if (enclosingTransaction) {
                     Integer statusCode1 = responses.get(0).getStatusCode();
+                    String msg1 = Strings.nullToEmpty(responses.get(0).getBody());
                     assertNotNull(statusCode1, "First enlosingTransaction response status code");
-                    assertTrue(SC_OK == statusCode1 || SC_CONFLICT == statusCode1, "Status code: " + statusCode1);
+                    assertTrue(
+                            SC_OK == statusCode1
+                                    || SC_CONFLICT == statusCode1
+                                    || (SC_FORBIDDEN == statusCode1 && msg1.contains("Record has changed since last read")),
+                            "Status code: " + statusCode1 + ", message: " + msg1);
                     if (SC_OK == statusCode1) {
                         assertEquals(4, responses.size(), "Response size for enlosingTransaction OK response");
                         Integer statusCode4 = responses.get(3).getStatusCode();
@@ -394,16 +399,21 @@ public void run() {
                 } else {
                     assertEquals(4, responses.size(), "Response size for without-enlosingTransaction response");
                     Integer statusCode1 = responses.get(0).getStatusCode();
+                    String msg1 = Strings.nullToEmpty(responses.get(0).getBody());
                     assertNotNull(statusCode1, "First without-enlosingTransaction response status code");
-                    assertTrue(SC_OK == statusCode1 || SC_CONFLICT == statusCode1,
-                            "First without-enlosingTransaction response status code: " + statusCode1);
+                    assertTrue(
+                            SC_OK == statusCode1
+                                    || SC_CONFLICT == statusCode1
+                                    || (SC_FORBIDDEN == statusCode1 && msg1.contains("Record has changed since last read")),
+                            "First without-enlosingTransaction response status code: " + statusCode1 + ", message: " + msg1);
                     Integer statusCode4 = responses.get(3).getStatusCode();
                     assertNotNull(statusCode4, "Last without-enlosingTransaction response status code");
                     assertTrue(
                             SC_OK == statusCode1 ? (SC_OK == statusCode4 || SC_CONFLICT == statusCode4)
                                     : (SC_FORBIDDEN == statusCode4 || SC_CONFLICT == statusCode4),
                             "Last without-enlosingTransaction response status code: " + statusCode4);
                 }
+
             } else {
                 String json = transactionData.getJson();
                 String response = (String) this.savingsHelper.depositToSavingsAccount(savingsId, json, null);
@@ -444,8 +454,11 @@ private void runDeadlockBatch(SavingsAccountHelper savingsHelper, Integer saving
         String msg = Strings.nullToEmpty(response1.getBody());
         assertNotNull(statusCode, "First response status code");
         assertTrue(
-                SC_OK == statusCode || SC_CONFLICT == statusCode
-                        || (SC_FORBIDDEN == statusCode && msg.contains("Cannot add or update a child row")),
+                SC_OK == statusCode
+                        || SC_CONFLICT == statusCode
+                        || (SC_FORBIDDEN == statusCode
+                        && (msg.contains("Cannot add or update a child row")
+                        || msg.contains("Record has changed since last read"))),
                 "Status code: " + statusCode + ", message: " + msg);
         if (SC_OK == statusCode) {
             assertEquals(4, responses.size(), "Response size for OK response");