Merge cockroachdb#109073

109073: jobs: remove spurious calls to `settings.TestingSaveRegistry` r=stevendanna a=knz Epic: CRDB-28893 Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]>
knz · Aug 19, 2023 · c4eda8e · c4eda8e
2 parents 0352a78 + a8e0cb5
commit c4eda8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/pkg/jobs/job_scheduler_test.go b/pkg/jobs/job_scheduler_test.go
@@ -201,19 +201,18 @@ func TestJobSchedulerDaemonInitialScanDelay(t *testing.T) {
 	}
 }
 
-func getScopedSettings() (*settings.Values, func()) {
+func getScopedSettings() *settings.Values {
 	sv := &settings.Values{}
 	sv.Init(context.Background(), nil)
-	return sv, settings.TestingSaveRegistry()
+	return sv
 }
 
 func TestJobSchedulerDaemonGetWaitPeriod(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 	ctx := context.Background()
 
-	sv, cleanup := getScopedSettings()
-	defer cleanup()
+	sv := getScopedSettings()
 
 	noJitter := func(d time.Duration) time.Duration { return d }
 
@@ -576,7 +575,6 @@ func TestJobSchedulerRetriesFailed(t *testing.T) {
 func TestJobSchedulerDaemonUsesSystemTables(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	defer settings.TestingSaveRegistry()()
 
 	// Make daemon run quickly.
 	knobs := &TestingKnobs{

diff --git a/pkg/jobs/testutils_test.go b/pkg/jobs/testutils_test.go
@@ -20,7 +20,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobstest"
 	"github.com/cockroachdb/cockroach/pkg/scheduledjobs"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
-	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/sql/isql"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
@@ -90,7 +89,6 @@ func newTestHelperForTables(
 		sqlDB.Exec(t, jobstest.GetJobsTableSchema(env))
 	}
 
-	restoreRegistry := settings.TestingSaveRegistry()
 	return &testHelper{
 			env:    env,
 			server: s,
@@ -107,7 +105,6 @@ func newTestHelperForTables(
 				sqlDB.Exec(t, "DROP TABLE "+env.ScheduledJobsTableName())
 			}
 			s.Stopper().Stop(context.Background())
-			restoreRegistry()
 		}
 }