Skip to content

Commit 2513631

Browse files
mattnmattn
committed
Merge pull request #251 from larsmans/fixes
Clean up tempfiles in tests
2 parents a755cdc + 21637a6 commit 2513631

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎sqlite3_fts3_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313

1414
func TestFTS3(t *testing.T) {
1515
tempFilename := TempFilename(t)
16+
defer os.Remove(tempFilename)
1617
db, err := sql.Open("sqlite3", tempFilename)
1718
if err != nil {
1819
t.Fatal("Failed to open database:", err)
1920
}
20-
defer os.Remove(tempFilename)
2121
defer db.Close()
2222

2323
_, err = db.Exec("DROP TABLE foo")
@@ -84,11 +84,11 @@ func TestFTS3(t *testing.T) {
8484

8585
func TestFTS4(t *testing.T) {
8686
tempFilename := TempFilename(t)
87+
defer os.Remove(tempFilename)
8788
db, err := sql.Open("sqlite3", tempFilename)
8889
if err != nil {
8990
t.Fatal("Failed to open database:", err)
9091
}
91-
defer os.Remove(tempFilename)
9292
defer db.Close()
9393

9494
_, err = db.Exec("DROP TABLE foo")

‎sqlite3_test.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ func TestReadonly(t *testing.T) {
109109

110110
func TestClose(t *testing.T) {
111111
tempFilename := TempFilename(t)
112+
defer os.Remove(tempFilename)
112113
db, err := sql.Open("sqlite3", tempFilename)
113114
if err != nil {
114115
t.Fatal("Failed to open database:", err)
115116
}
116-
defer os.Remove(tempFilename)
117117

118118
_, err = db.Exec("drop table foo")
119119
_, err = db.Exec("create table foo (id integer)")
@@ -135,11 +135,11 @@ func TestClose(t *testing.T) {
135135

136136
func TestInsert(t *testing.T) {
137137
tempFilename := TempFilename(t)
138+
defer os.Remove(tempFilename)
138139
db, err := sql.Open("sqlite3", tempFilename)
139140
if err != nil {
140141
t.Fatal("Failed to open database:", err)
141142
}
142-
defer os.Remove(tempFilename)
143143
defer db.Close()
144144

145145
_, err = db.Exec("drop table foo")
@@ -174,11 +174,11 @@ func TestInsert(t *testing.T) {
174174

175175
func TestUpdate(t *testing.T) {
176176
tempFilename := TempFilename(t)
177+
defer os.Remove(tempFilename)
177178
db, err := sql.Open("sqlite3", tempFilename)
178179
if err != nil {
179180
t.Fatal("Failed to open database:", err)
180181
}
181-
defer os.Remove(tempFilename)
182182
defer db.Close()
183183

184184
_, err = db.Exec("drop table foo")
@@ -239,11 +239,11 @@ func TestUpdate(t *testing.T) {
239239

240240
func TestDelete(t *testing.T) {
241241
tempFilename := TempFilename(t)
242+
defer os.Remove(tempFilename)
242243
db, err := sql.Open("sqlite3", tempFilename)
243244
if err != nil {
244245
t.Fatal("Failed to open database:", err)
245246
}
246-
defer os.Remove(tempFilename)
247247
defer db.Close()
248248

249249
_, err = db.Exec("drop table foo")
@@ -300,11 +300,11 @@ func TestDelete(t *testing.T) {
300300

301301
func TestBooleanRoundtrip(t *testing.T) {
302302
tempFilename := TempFilename(t)
303+
defer os.Remove(tempFilename)
303304
db, err := sql.Open("sqlite3", tempFilename)
304305
if err != nil {
305306
t.Fatal("Failed to open database:", err)
306307
}
307-
defer os.Remove(tempFilename)
308308
defer db.Close()
309309

310310
_, err = db.Exec("DROP TABLE foo")
@@ -351,11 +351,11 @@ func timezone(t time.Time) string { return t.Format("-07:00") }
351351

352352
func TestTimestamp(t *testing.T) {
353353
tempFilename := TempFilename(t)
354+
defer os.Remove(tempFilename)
354355
db, err := sql.Open("sqlite3", tempFilename)
355356
if err != nil {
356357
t.Fatal("Failed to open database:", err)
357358
}
358-
defer os.Remove(tempFilename)
359359
defer db.Close()
360360

361361
_, err = db.Exec("DROP TABLE foo")
@@ -452,12 +452,12 @@ func TestTimestamp(t *testing.T) {
452452

453453
func TestBoolean(t *testing.T) {
454454
tempFilename := TempFilename(t)
455+
defer os.Remove(tempFilename)
455456
db, err := sql.Open("sqlite3", tempFilename)
456457
if err != nil {
457458
t.Fatal("Failed to open database:", err)
458459
}
459460

460-
defer os.Remove(tempFilename)
461461
defer db.Close()
462462

463463
_, err = db.Exec("CREATE TABLE foo(id INTEGER, fbool BOOLEAN)")
@@ -544,12 +544,11 @@ func TestBoolean(t *testing.T) {
544544

545545
func TestFloat32(t *testing.T) {
546546
tempFilename := TempFilename(t)
547+
defer os.Remove(tempFilename)
547548
db, err := sql.Open("sqlite3", tempFilename)
548549
if err != nil {
549550
t.Fatal("Failed to open database:", err)
550551
}
551-
552-
defer os.Remove(tempFilename)
553552
defer db.Close()
554553

555554
_, err = db.Exec("CREATE TABLE foo(id INTEGER)")
@@ -582,12 +581,11 @@ func TestFloat32(t *testing.T) {
582581

583582
func TestNull(t *testing.T) {
584583
tempFilename := TempFilename(t)
584+
defer os.Remove(tempFilename)
585585
db, err := sql.Open("sqlite3", tempFilename)
586586
if err != nil {
587587
t.Fatal("Failed to open database:", err)
588588
}
589-
590-
defer os.Remove(tempFilename)
591589
defer db.Close()
592590

593591
rows, err := db.Query("SELECT 3.141592")
@@ -614,12 +612,11 @@ func TestNull(t *testing.T) {
614612

615613
func TestTransaction(t *testing.T) {
616614
tempFilename := TempFilename(t)
615+
defer os.Remove(tempFilename)
617616
db, err := sql.Open("sqlite3", tempFilename)
618617
if err != nil {
619618
t.Fatal("Failed to open database:", err)
620619
}
621-
622-
defer os.Remove(tempFilename)
623620
defer db.Close()
624621

625622
_, err = db.Exec("CREATE TABLE foo(id INTEGER)")
@@ -674,13 +671,13 @@ func TestTransaction(t *testing.T) {
674671

675672
func TestWAL(t *testing.T) {
676673
tempFilename := TempFilename(t)
674+
defer os.Remove(tempFilename)
677675
db, err := sql.Open("sqlite3", tempFilename)
678676
if err != nil {
679677
t.Fatal("Failed to open database:", err)
680678
}
681-
682-
defer os.Remove(tempFilename)
683679
defer db.Close()
680+
684681
if _, err = db.Exec("PRAGMA journal_mode=WAL;"); err != nil {
685682
t.Fatal("Failed to Exec PRAGMA journal_mode:", err)
686683
}
@@ -722,11 +719,11 @@ func TestTimezoneConversion(t *testing.T) {
722719
zones := []string{"UTC", "US/Central", "US/Pacific", "Local"}
723720
for _, tz := range zones {
724721
tempFilename := TempFilename(t)
722+
defer os.Remove(tempFilename)
725723
db, err := sql.Open("sqlite3", tempFilename+"?_loc="+url.QueryEscape(tz))
726724
if err != nil {
727725
t.Fatal("Failed to open database:", err)
728726
}
729-
defer os.Remove(tempFilename)
730727
defer db.Close()
731728

732729
_, err = db.Exec("DROP TABLE foo")
@@ -816,11 +813,11 @@ func TestTimezoneConversion(t *testing.T) {
816813

817814
func TestSuite(t *testing.T) {
818815
tempFilename := TempFilename(t)
816+
defer os.Remove(tempFilename)
819817
db, err := sql.Open("sqlite3", tempFilename+"?_busy_timeout=99999")
820818
if err != nil {
821819
t.Fatal(err)
822820
}
823-
defer os.Remove(tempFilename)
824821
defer db.Close()
825822

826823
sqlite3_test.RunTests(t, db, sqlite3_test.SQLITE)
@@ -830,11 +827,11 @@ func TestSuite(t *testing.T) {
830827
// https://github.com/mattn/go-sqlite3/issues/82
831828
func TestExecer(t *testing.T) {
832829
tempFilename := TempFilename(t)
830+
defer os.Remove(tempFilename)
833831
db, err := sql.Open("sqlite3", tempFilename)
834832
if err != nil {
835833
t.Fatal("Failed to open database:", err)
836834
}
837-
defer os.Remove(tempFilename)
838835
defer db.Close()
839836

840837
_, err = db.Exec(`
@@ -850,11 +847,11 @@ func TestExecer(t *testing.T) {
850847

851848
func TestQueryer(t *testing.T) {
852849
tempFilename := TempFilename(t)
850+
defer os.Remove(tempFilename)
853851
db, err := sql.Open("sqlite3", tempFilename)
854852
if err != nil {
855853
t.Fatal("Failed to open database:", err)
856854
}
857-
defer os.Remove(tempFilename)
858855
defer db.Close()
859856

860857
_, err = db.Exec(`
@@ -891,6 +888,7 @@ func TestQueryer(t *testing.T) {
891888

892889
func TestStress(t *testing.T) {
893890
tempFilename := TempFilename(t)
891+
defer os.Remove(tempFilename)
894892
db, err := sql.Open("sqlite3", tempFilename)
895893
if err != nil {
896894
t.Fatal("Failed to open database:", err)
@@ -929,6 +927,7 @@ func TestStress(t *testing.T) {
929927
func TestDateTimeLocal(t *testing.T) {
930928
zone := "Asia/Tokyo"
931929
tempFilename := TempFilename(t)
930+
defer os.Remove(tempFilename)
932931
db, err := sql.Open("sqlite3", tempFilename+"?_loc="+zone)
933932
if err != nil {
934933
t.Fatal("Failed to open database:", err)
@@ -996,11 +995,11 @@ func TestVersion(t *testing.T) {
996995

997996
func TestNumberNamedParams(t *testing.T) {
998997
tempFilename := TempFilename(t)
998+
defer os.Remove(tempFilename)
999999
db, err := sql.Open("sqlite3", tempFilename)
10001000
if err != nil {
10011001
t.Fatal("Failed to open database:", err)
10021002
}
1003-
defer os.Remove(tempFilename)
10041003
defer db.Close()
10051004

10061005
_, err = db.Exec(`
@@ -1032,11 +1031,11 @@ func TestNumberNamedParams(t *testing.T) {
10321031

10331032
func TestStringContainingZero(t *testing.T) {
10341033
tempFilename := TempFilename(t)
1034+
defer os.Remove(tempFilename)
10351035
db, err := sql.Open("sqlite3", tempFilename)
10361036
if err != nil {
10371037
t.Fatal("Failed to open database:", err)
10381038
}
1039-
defer os.Remove(tempFilename)
10401039
defer db.Close()
10411040

10421041
_, err = db.Exec(`
@@ -1092,6 +1091,7 @@ func (t TimeStamp) Value() (driver.Value, error) {
10921091

10931092
func TestDateTimeNow(t *testing.T) {
10941093
tempFilename := TempFilename(t)
1094+
defer os.Remove(tempFilename)
10951095
db, err := sql.Open("sqlite3", tempFilename)
10961096
if err != nil {
10971097
t.Fatal("Failed to open database:", err)

0 commit comments

Comments
 (0)