roachtest: Update hibernate blacklist 2.2

Due to cockroachdb#32423, cockroachdb#31721 has been fixed.

Also cleaned up the test output a little bit.

Closes cockroachdb#31721.
Fixes cockroachdb#32714.

Release note: None

pkg/cmd/roachtest/hibernate.go

@@ -253,15 +253,16 @@ echo "ext {
  t.l.Printf("------------------------\n")
 
  var bResults strings.Builder
- fmt.Fprintf(&bResults, "%d Total Test Run\n",
+ fmt.Fprintf(&bResults, "Tests run on Cockroach %s\n", version)
+ fmt.Fprintf(&bResults, "%d Total Tests Run\n",
  passExpectedCount+passUnexpectedCount+failExpectedCount+failUnexpectedCount,
  )
  fmt.Fprintf(&bResults, "%d tests passed\n", passUnexpectedCount+passExpectedCount)
  fmt.Fprintf(&bResults, "%d tests failed\n", failUnexpectedCount+failExpectedCount)
  fmt.Fprintf(&bResults, "%d tests passed unexpectedly\n", passUnexpectedCount)
  fmt.Fprintf(&bResults, "%d tests failed unexpectedly\n", failUnexpectedCount)
  fmt.Fprintf(&bResults, "%d tests expected failed, but not run \n", notRunCount)
- fmt.Fprintf(&bResults, "For a full summary, look at artifacts/hibernate/logs/report/index.html\n")
+ fmt.Fprintf(&bResults, "For a full summary look at the hibernate artifacts \n")
  t.l.Printf("%s\n", bResults.String())
  t.l.Printf("------------------------\n")
 
@@ -281,12 +282,9 @@ echo "ext {
  fmt.Fprintf(&b, "}\n\n")
  t.l.Printf("\n\n%s\n\n", b.String())
  t.l.Printf("------------------------\n")
- t.Fatalf("\n"+
- "%d tests failed unexpectedly\n"+
- "%d tests passed unexpectedly\n"+
- "%d tests were not run that were expected to fail\n"+
- "See artifacts/hibernate/log/logs/report for more details",
- failUnexpectedCount, passUnexpectedCount, notRunCount,
+ t.Fatalf("\n%s\nAn updated blacklist (%s) is available in the artifacts' hibernate log\n",
+ bResults.String(),
+ blacklistName,
  )
  }
  }

pkg/cmd/roachtest/hibernate_blacklist.go

@@ -188,7 +188,6 @@ var hibernateBlackList2_2 = blacklist{
  "org.hibernate.test.hql.CriteriaHQLAlignmentTest.testCountReturnValues": "5807",
  "org.hibernate.test.hql.DeleteQuerySubqueryReferencingTargetPropertyTest.testSubQueryReferencingTargetProperty": "31670",
  "org.hibernate.test.hql.DeleteWithSubqueryTest.testDeleteMemberOf": "31670",
- "org.hibernate.test.hql.InsertWithSubSelectTest.testInsert": "31721",
  "org.hibernate.test.hql.ScrollableCollectionFetchingTest.testScrollingJoinFetchesForward": "5807",
  "org.hibernate.test.hql.ScrollableCollectionFetchingTest.testScrollingJoinFetchesPositioning": "5807",
  "org.hibernate.test.hql.ScrollableCollectionFetchingTest.testScrollingJoinFetchesReverse": "5807",