simplify tests

Signed-off-by: Tim Vaillancourt <[email protected]>
timvaillancourt · Feb 11, 2025 · 89031a3 · 89031a3
1 parent 7dd6da1
commit 89031a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/go/vt/vtorc/inst/cell_dao_test.go b/go/vt/vtorc/inst/cell_dao_test.go
@@ -25,10 +25,9 @@ import (
 )
 
 func TestSaveReadAndDeleteCells(t *testing.T) {
-	// Clear the database after the test. The easiest way to do that is to run all the initialization commands again.
-	defer func() {
-		db.ClearVTOrcDatabase()
-	}()
+	db.ClearVTOrcDatabase()
+	defer db.ClearVTOrcDatabase()
+
 	cells := []string{"zone1", "zone2", "zone3"}
 	for _, cell := range cells {
 		require.NoError(t, SaveCell(cell))

diff --git a/go/vt/vtorc/logic/cell_discovery_test.go b/go/vt/vtorc/logic/cell_discovery_test.go
@@ -28,15 +28,11 @@ import (
 )
 
 func TestRefreshCells(t *testing.T) {
-	// Store the old flags and restore on test completion
-	oldTs := ts
-	defer func() {
-		ts = oldTs
-	}()
-
 	db.ClearVTOrcDatabase()
+	oldTs := ts
 	defer func() {
 		db.ClearVTOrcDatabase()
+		ts = oldTs
 	}()
 
 	cells := []string{"zone1", "zone2", "zone3"}