The GitHub Actions job "End to End" on 
grails-core.git/test/restore-transaction-service-specs-8.0.x has failed.
Run started by GitHub user sbglasius (triggered by sbglasius).

Head commit for run:
46a089a8fdf7eadfcdcdabd045c245814b86d8c3 / Søren Berg Glasius 
<[email protected]>
test(grails-datamapping-core): restore the transaction service specs lost in 
the 7.2.x merge

The 7.2.x -> 8.0.x merge hit an add/add conflict on
DefaultTransactionServiceSpec: both branches had independently created
it. The resolution kept 8.0.x's version, which had a single test, and
dropped 7.2.x's fourteen. 8.0.x went from 14 covered behaviours to 1.

The drop was accidental, not a scoping decision. The resolution was
half-applied: it took 7.2.x's four Spring transaction imports but not
the test methods that use them, leaving `PlatformTransactionManager`,
`TransactionDefinition`, `TransactionStatus` and
`TransactionSystemException` imported and unused on 8.0.x. Pre-merge
8.0.x had neither the imports nor the tests, so they arrived together
and only half survived.

Restore 7.2.x's suite and keep 8.0.x's accessor test, giving 15:

- the full `withTransaction`/`withRollback`/`withNewTransaction` matrix
  across the Closure, TransactionDefinition and Map overloads, each with
  its "datastore does not support transactions" counterpart
- `getDatastore/setDatastore round-trip`, covering the explicit
  `datastore` field 8.0.x added to DefaultTransactionService

The two branches' DefaultTransactionService differ only by that added
field and its accessors - every method the restored tests exercise is
byte-identical between 7.2.x and 8.0.x, so the suite ports unchanged.
7.2.x's property-style `transactionService.datastore = ...` resolves to
the new setter.

Also drop the class-level comment that said the overloads were out of
scope. It is no longer true once the suite is restored, and it referred
to "this PR" and "item 14" of a plan that is not in the repository.

All 15 pass:
  ./gradlew :grails-datamapping-core:test --tests \
    "org.grails.datastore.gorm.services.DefaultTransactionServiceSpec"

DefaultTenantServiceSpec, the other add/add in that merge, was resolved
cleanly and is left alone.

Report URL: https://github.com/apache/grails-core/actions/runs/33853908536

With regards,
GitHub Actions via GitBox

Reply via email to