Correctly handle errors in transaction tests

db/tests/utils.go

@@ -248,15 +248,16 @@ func ExecuteQueryTestCase(t *testing.T, schema string, collectionNames []string,
 
 		// Create the transactions before executing and queries
 		transactions := make([]core.Txn, 0, len(test.TransactionalQueries))
-		for _, tq := range test.TransactionalQueries {
+		erroredQueries := make([]bool, len(test.TransactionalQueries))
+		for i, tq := range test.TransactionalQueries {
 			if len(transactions) < tq.TransactionId {
 				continue
 			}
 
 			txn, err := db.NewTxn(ctx, false)
 			if err != nil {
 				if assertError(t, test.Description, err, tq.ExpectedError) {
-					return
+					erroredQueries[i] = true
 				}
 			}
 			defer txn.Discard(ctx)
@@ -266,28 +267,34 @@ func ExecuteQueryTestCase(t *testing.T, schema string, collectionNames []string,
 			transactions[tq.TransactionId] = txn
 		}
 
-		for _, tq := range test.TransactionalQueries {
+		for i, tq := range test.TransactionalQueries {
+			if erroredQueries[i] {
+				continue
+			}
 			result := db.ExecTransactionalQuery(ctx, tq.Query, transactions[tq.TransactionId])
 			if assertQueryResults(t, test.Description, result, tq.Results, tq.ExpectedError) {
-				return
+				erroredQueries[i] = true
 			}
 		}
 
 		txnIndexesCommited := map[int]struct{}{}
-		for _, tq := range test.TransactionalQueries {
+		for i, tq := range test.TransactionalQueries {
+			if erroredQueries[i] {
+				continue
+			}
 			if _, alreadyCommited := txnIndexesCommited[tq.TransactionId]; alreadyCommited {
 				continue
 			}
 			txnIndexesCommited[tq.TransactionId] = struct{}{}
 
 			err := transactions[tq.TransactionId].Commit(ctx)
 			if assertError(t, test.Description, err, tq.ExpectedError) {
-				return
+				erroredQueries[i] = true
 			}
 		}
 
-		for _, tq := range test.TransactionalQueries {
-			if tq.ExpectedError != "" {
+		for i, tq := range test.TransactionalQueries {
+			if tq.ExpectedError != "" && !erroredQueries[i] {
 				assert.Fail(t, "Expected an error however none was raised.", test.Description)
 			}
 		}