Unit of Work - Savepoint Release support

[DmitriiDronov]

Is your feature request related to a problem? Please describe.
There are problems when using the unit of work in classes where multiple callouts are expected within the same transaction, causing this error to appear:
"All active Savepoints must be released before making callouts".

Describe the solution you'd like
It looks like a simple fix; however, some unit tests are failing.
This is something I came up with:

public void commitWork() {
        Savepoint sp = Database.setSavepoint();
        Boolean wasSuccessful = false;
        try {
            doCommitWork();
            wasSuccessful = true;
        } catch (Exception e) {
            Database.rollback(sp);
            throw e;
        } finally {
            if (wasSuccessful && !Test.isRunningTest()) {
                Database.releaseSavepoint(sp);
            }
            doAfterCommitWorkSteps(wasSuccessful);
        }
    }

I added myself the finally if-block:

            if (wasSuccessful && !Test.isRunningTest()) {
                Database.releaseSavepoint(sp);
            }

I consider Test.isRunningTest() in this scenario a bad practice since this is used to bypass unit tests.

Additional context
Release Savepoint Documentation
Make Callouts After Rolling Back DML and Releasing Savepoints

[Imustyk]

The fix works, but relying on Test.isRunningTest() is not a best practice — it hides the problem instead of solving it. It’s better to adjust savepoint handling.

[DmitriiDronov]

BTW, the code block can be used as a hotfix; however, I still think that unit tests should be adjusted

[KatiaDev]

Thanks for raising this, the proposed fix makes sense. I agree that using Test.isRunningTest() to bypass behavior isn’t ideal. Having built-in savepoint release support would make UoW much safer for real-world transactional patterns.