Skip to content

Commit 8c85c27

Browse files
ashish-goswamiashish-goswami
authored
Have same prefix for directory in tests (#878)
Currently, we are using different prefixes for creating Badger directory in tests. This PR makes changes to have prefix badger-test in all tests.
1 parent 031bccd commit 8c85c27

File tree

9 files changed

+52
-52
lines changed

9 files changed

+52
-52
lines changed

‎backup_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
)
3434

3535
func TestBackupRestore1(t *testing.T) {
36-
dir, err := ioutil.TempDir("", "badger")
36+
dir, err := ioutil.TempDir("", "badger-test")
3737
require.NoError(t, err)
3838
defer os.RemoveAll(dir)
3939
db, err := Open(getTestOptions(dir))
@@ -71,7 +71,7 @@ func TestBackupRestore1(t *testing.T) {
7171
require.NoError(t, err)
7272

7373
// Use different directory.
74-
dir, err = ioutil.TempDir("", "badger")
74+
dir, err = ioutil.TempDir("", "badger-test")
7575
require.NoError(t, err)
7676
defer os.RemoveAll(dir)
7777
bak, err := ioutil.TempFile(dir, "badgerbak")

‎db2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestTruncateVlogWithClose(t *testing.T) {
4141
return m
4242
}
4343

44-
dir, err := ioutil.TempDir("", "badger")
44+
dir, err := ioutil.TempDir("", "badger-test")
4545
require.NoError(t, err)
4646
defer os.RemoveAll(dir)
4747

‎db_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func txnDelete(t *testing.T, kv *DB, key []byte) {
124124

125125
// Opens a badger db and runs a a test on it.
126126
func runBadgerTest(t *testing.T, opts *Options, test func(t *testing.T, db *DB)) {
127-
dir, err := ioutil.TempDir(".", "badger-test")
127+
dir, err := ioutil.TempDir("", "badger-test")
128128
require.NoError(t, err)
129129
defer os.RemoveAll(dir)
130130
if opts == nil {
@@ -329,7 +329,7 @@ func TestTxnTooBig(t *testing.T) {
329329
}
330330

331331
func TestForceCompactL0(t *testing.T) {
332-
dir, err := ioutil.TempDir("", "badger")
332+
dir, err := ioutil.TempDir("", "badger-test")
333333
require.NoError(t, err)
334334
defer os.RemoveAll(dir)
335335

@@ -593,7 +593,7 @@ func TestIterate2Basic(t *testing.T) {
593593
}
594594

595595
func TestLoad(t *testing.T) {
596-
dir, err := ioutil.TempDir("", "badger")
596+
dir, err := ioutil.TempDir("", "badger-test")
597597
require.NoError(t, err)
598598
defer os.RemoveAll(dir)
599599
n := 10000
@@ -764,7 +764,7 @@ func TestIterateParallel(t *testing.T) {
764764
}
765765

766766
func TestDeleteWithoutSyncWrite(t *testing.T) {
767-
dir, err := ioutil.TempDir("", "badger")
767+
dir, err := ioutil.TempDir("", "badger-test")
768768
require.NoError(t, err)
769769
defer os.RemoveAll(dir)
770770
opt := DefaultOptions
@@ -880,7 +880,7 @@ func TestIteratorPrefetchSize(t *testing.T) {
880880
}
881881

882882
func TestSetIfAbsentAsync(t *testing.T) {
883-
dir, err := ioutil.TempDir("", "badger")
883+
dir, err := ioutil.TempDir("", "badger-test")
884884
require.NoError(t, err)
885885
defer os.RemoveAll(dir)
886886
kv, _ := Open(getTestOptions(dir))
@@ -1073,7 +1073,7 @@ func TestExpiry(t *testing.T) {
10731073
}
10741074

10751075
func TestExpiryImproperDBClose(t *testing.T) {
1076-
dir, err := ioutil.TempDir("", "badger")
1076+
dir, err := ioutil.TempDir("", "badger-test")
10771077
require.NoError(t, err)
10781078
defer os.RemoveAll(dir)
10791079
opt := getTestOptions(dir)
@@ -1135,7 +1135,7 @@ var benchmarkData = []struct {
11351135
}
11361136

11371137
func TestLargeKeys(t *testing.T) {
1138-
dir, err := ioutil.TempDir("", "badger")
1138+
dir, err := ioutil.TempDir("", "badger-test")
11391139
require.NoError(t, err)
11401140
defer os.RemoveAll(dir)
11411141

@@ -1189,7 +1189,7 @@ func TestCreateDirs(t *testing.T) {
11891189
}
11901190

11911191
func TestGetSetDeadlock(t *testing.T) {
1192-
dir, err := ioutil.TempDir("", "badger")
1192+
dir, err := ioutil.TempDir("", "badger-test")
11931193
fmt.Println(dir)
11941194
require.NoError(t, err)
11951195
defer os.RemoveAll(dir)
@@ -1236,7 +1236,7 @@ func TestGetSetDeadlock(t *testing.T) {
12361236
}
12371237

12381238
func TestWriteDeadlock(t *testing.T) {
1239-
dir, err := ioutil.TempDir("", "badger")
1239+
dir, err := ioutil.TempDir("", "badger-test")
12401240
fmt.Println(dir)
12411241
require.NoError(t, err)
12421242
defer os.RemoveAll(dir)
@@ -1391,7 +1391,7 @@ func TestSequence_Release(t *testing.T) {
13911391
}
13921392

13931393
func TestReadOnly(t *testing.T) {
1394-
dir, err := ioutil.TempDir("", "badger")
1394+
dir, err := ioutil.TempDir("", "badger-test")
13951395
require.NoError(t, err)
13961396
defer os.RemoveAll(dir)
13971397
opts := getTestOptions(dir)
@@ -1460,7 +1460,7 @@ func TestReadOnly(t *testing.T) {
14601460
}
14611461

14621462
func TestLSMOnly(t *testing.T) {
1463-
dir, err := ioutil.TempDir("", "badger")
1463+
dir, err := ioutil.TempDir("", "badger-test")
14641464
require.NoError(t, err)
14651465
defer os.RemoveAll(dir)
14661466

@@ -1578,7 +1578,7 @@ func TestGoroutineLeak(t *testing.T) {
15781578
}
15791579

15801580
func ExampleOpen() {
1581-
dir, err := ioutil.TempDir("", "badger")
1581+
dir, err := ioutil.TempDir("", "badger-test")
15821582
if err != nil {
15831583
log.Fatal(err)
15841584
}
@@ -1636,7 +1636,7 @@ func ExampleOpen() {
16361636
}
16371637

16381638
func ExampleTxn_NewIterator() {
1639-
dir, err := ioutil.TempDir("", "badger")
1639+
dir, err := ioutil.TempDir("", "badger-test")
16401640
if err != nil {
16411641
log.Fatal(err)
16421642
}
@@ -1697,7 +1697,7 @@ func ExampleTxn_NewIterator() {
16971697
}
16981698

16991699
func TestSyncForRace(t *testing.T) {
1700-
dir, err := ioutil.TempDir("", "badger")
1700+
dir, err := ioutil.TempDir("", "badger-test")
17011701
require.NoError(t, err)
17021702
defer os.RemoveAll(dir)
17031703

@@ -1752,7 +1752,7 @@ func TestSyncForRace(t *testing.T) {
17521752
// Earlier, if head is not pointing to latest Vlog file, then at replay badger used to crash with
17531753
// index out of range panic. After fix in this commit it should not.
17541754
func TestNoCrash(t *testing.T) {
1755-
dir, err := ioutil.TempDir("", "badger")
1755+
dir, err := ioutil.TempDir("", "badger-test")
17561756
require.NoError(t, err, "cannot create badger dir")
17571757
defer os.RemoveAll(dir)
17581758

@@ -1784,7 +1784,7 @@ func TestNoCrash(t *testing.T) {
17841784
}
17851785

17861786
func TestForceFlushMemtable(t *testing.T) {
1787-
dir, err := ioutil.TempDir("", "badger")
1787+
dir, err := ioutil.TempDir("", "badger-test")
17881788
require.NoError(t, err, "temp dir for badger count not be created")
17891789

17901790
ops := getTestOptions(dir)

‎managed_db_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func numKeysManaged(db *DB, readTs uint64) int {
5757
}
5858

5959
func TestDropAllManaged(t *testing.T) {
60-
dir, err := ioutil.TempDir("", "badger")
60+
dir, err := ioutil.TempDir("", "badger-test")
6161
require.NoError(t, err)
6262
defer os.RemoveAll(dir)
6363
opts := getTestOptions(dir)
@@ -102,7 +102,7 @@ func TestDropAllManaged(t *testing.T) {
102102
}
103103

104104
func TestDropAll(t *testing.T) {
105-
dir, err := ioutil.TempDir("", "badger")
105+
dir, err := ioutil.TempDir("", "badger-test")
106106
require.NoError(t, err)
107107
defer os.RemoveAll(dir)
108108
opts := getTestOptions(dir)
@@ -138,7 +138,7 @@ func TestDropAll(t *testing.T) {
138138
}
139139

140140
func TestDropAllTwice(t *testing.T) {
141-
dir, err := ioutil.TempDir("", "badger")
141+
dir, err := ioutil.TempDir("", "badger-test")
142142
require.NoError(t, err)
143143
defer os.RemoveAll(dir)
144144
opts := getTestOptions(dir)
@@ -166,7 +166,7 @@ func TestDropAllTwice(t *testing.T) {
166166
}
167167

168168
func TestDropAllWithPendingTxn(t *testing.T) {
169-
dir, err := ioutil.TempDir("", "badger")
169+
dir, err := ioutil.TempDir("", "badger-test")
170170
require.NoError(t, err)
171171
defer os.RemoveAll(dir)
172172
opts := getTestOptions(dir)
@@ -232,7 +232,7 @@ func TestDropAllWithPendingTxn(t *testing.T) {
232232
}
233233

234234
func TestDropReadOnly(t *testing.T) {
235-
dir, err := ioutil.TempDir("", "badger")
235+
dir, err := ioutil.TempDir("", "badger-test")
236236
require.NoError(t, err)
237237
defer os.RemoveAll(dir)
238238
opts := getTestOptions(dir)
@@ -264,7 +264,7 @@ func TestDropReadOnly(t *testing.T) {
264264
}
265265

266266
func TestWriteAfterClose(t *testing.T) {
267-
dir, err := ioutil.TempDir(".", "badger-test")
267+
dir, err := ioutil.TempDir("", "badger-test")
268268
require.NoError(t, err)
269269
defer os.RemoveAll(dir)
270270
opts := getTestOptions(dir)
@@ -290,7 +290,7 @@ func TestWriteAfterClose(t *testing.T) {
290290
}
291291

292292
func TestDropAllRace(t *testing.T) {
293-
dir, err := ioutil.TempDir("", "badger")
293+
dir, err := ioutil.TempDir("", "badger-test")
294294
require.NoError(t, err)
295295
defer os.RemoveAll(dir)
296296
opts := getTestOptions(dir)
@@ -354,7 +354,7 @@ func TestDropAllRace(t *testing.T) {
354354
}
355355

356356
func TestDropPrefix(t *testing.T) {
357-
dir, err := ioutil.TempDir("", "badger")
357+
dir, err := ioutil.TempDir("", "badger-test")
358358
require.NoError(t, err)
359359
defer os.RemoveAll(dir)
360360
opts := getTestOptions(dir)
@@ -405,7 +405,7 @@ func TestDropPrefix(t *testing.T) {
405405
}
406406

407407
func TestDropPrefixWithPendingTxn(t *testing.T) {
408-
dir, err := ioutil.TempDir("", "badger")
408+
dir, err := ioutil.TempDir("", "badger-test")
409409
require.NoError(t, err)
410410
defer os.RemoveAll(dir)
411411
opts := getTestOptions(dir)
@@ -474,7 +474,7 @@ func TestDropPrefixWithPendingTxn(t *testing.T) {
474474
}
475475

476476
func TestDropPrefixReadOnly(t *testing.T) {
477-
dir, err := ioutil.TempDir("", "badger")
477+
dir, err := ioutil.TempDir("", "badger-test")
478478
require.NoError(t, err)
479479
defer os.RemoveAll(dir)
480480
opts := getTestOptions(dir)
@@ -506,7 +506,7 @@ func TestDropPrefixReadOnly(t *testing.T) {
506506
}
507507

508508
func TestDropPrefixRace(t *testing.T) {
509-
dir, err := ioutil.TempDir("", "badger")
509+
dir, err := ioutil.TempDir("", "badger-test")
510510
require.NoError(t, err)
511511
defer os.RemoveAll(dir)
512512
opts := getTestOptions(dir)

‎manifest_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
)
3636

3737
func TestManifestBasic(t *testing.T) {
38-
dir, err := ioutil.TempDir("", "badger")
38+
dir, err := ioutil.TempDir("", "badger-test")
3939
require.NoError(t, err)
4040
defer os.RemoveAll(dir)
4141

@@ -70,7 +70,7 @@ func TestManifestBasic(t *testing.T) {
7070
}
7171

7272
func helpTestManifestFileCorruption(t *testing.T, off int64, errorContent string) {
73-
dir, err := ioutil.TempDir("", "badger")
73+
dir, err := ioutil.TempDir("", "badger-test")
7474
require.NoError(t, err)
7575
defer os.RemoveAll(dir)
7676

@@ -161,7 +161,7 @@ func buildTable(t *testing.T, keyValues [][]string) *os.File {
161161
}
162162

163163
func TestOverlappingKeyRangeError(t *testing.T) {
164-
dir, err := ioutil.TempDir("", "badger")
164+
dir, err := ioutil.TempDir("", "badger-test")
165165
require.NoError(t, err)
166166
defer os.RemoveAll(dir)
167167
opt := DefaultOptions
@@ -210,7 +210,7 @@ func TestOverlappingKeyRangeError(t *testing.T) {
210210
}
211211

212212
func TestManifestRewrite(t *testing.T) {
213-
dir, err := ioutil.TempDir("", "badger")
213+
dir, err := ioutil.TempDir("", "badger-test")
214214
require.NoError(t, err)
215215
defer os.RemoveAll(dir)
216216
deletionsThreshold := 10

‎merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestGetMergeOperator(t *testing.T) {
112112
})
113113
})
114114
t.Run("Old keys should be removed after compaction", func(t *testing.T) {
115-
dir, err := ioutil.TempDir(".", "badger-test")
115+
dir, err := ioutil.TempDir("", "badger-test")
116116
require.NoError(t, err)
117117
defer os.RemoveAll(dir)
118118

‎stream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (c *collector) Send(list *bpb.KVList) error {
6666
var ctxb = context.Background()
6767

6868
func TestStream(t *testing.T) {
69-
dir, err := ioutil.TempDir("", "badger")
69+
dir, err := ioutil.TempDir("", "badger-test")
7070
require.NoError(t, err)
7171
defer os.RemoveAll(dir)
7272

‎txn_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ func TestIteratorAllVersionsWithDeleted2(t *testing.T) {
708708
}
709709

710710
func TestManagedDB(t *testing.T) {
711-
dir, err := ioutil.TempDir("", "badger")
711+
dir, err := ioutil.TempDir("", "badger-test")
712712
require.NoError(t, err)
713713
defer os.RemoveAll(dir)
714714

0 commit comments

Comments
 (0)