backupccl: unskip TestIngest

The issue here was that we recently added a log.Scope(t).Close(t) call
to this test. However, log.Scope(t) creates a goroutine that is only
cleaned up when the defer is called. As a result a leaktest inside the
given subtests failed.

Here, we move the log scope into the subtest as well.

Fixes #104639

Release note: None

pkg/ccl/backupccl/restore_data_processor_test.go

@@ -43,7 +43,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -152,9 +151,6 @@ func clientKVsToEngineKVs(kvs []kv.KeyValue) []storage.MVCCKeyValue {
 
 func TestIngest(t *testing.T) {
 	defer leaktest.AfterTest(t)()
-	defer log.Scope(t).Close(t)
-
-	skip.WithIssue(t, 104639, "flaky test")
 
 	ctx := context.Background()
 	t.Run("batch=default", func(t *testing.T) {
@@ -172,6 +168,7 @@ func TestIngest(t *testing.T) {
 
 func runTestIngest(t *testing.T, init func(*cluster.Settings)) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	dir, dirCleanupFn := testutils.TempDir(t)
 	defer dirCleanupFn()