alihan/rqlite-distributed-sql
1
0
Fork 0
mirror of https://github.com/rqlite/rqlite.git synced 2022-10-30 02:37:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

test: use T.TempDir to create temporary test directory

Browse Source 
This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Prior to this commit, temporary directory created using `ioutil.TempDir`
needs to be removed manually by calling `os.RemoveAll`, which is omitted
in some tests. The error handling boilerplate e.g.
	defer func() {
		if err := os.RemoveAll(dir); err != nil {
			t.Fatal(err)
		}
	}
is also tedious, but `t.TempDir` handles this for us nicely.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2022-10-26 23:45:46 +08:00
parent 694d9c4592
commit 5141eff5fc
4 changed files with 56 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
db/db_test.go
View File

@@ -21,8 +21,7 @@ import (
*/ */
func Test_DbFileCreation(t *testing.T) { func Test_DbFileCreation(t *testing.T) {
dir, err := ioutil.TempDir("", "rqlite-test-") dir := t.TempDir()
defer os.RemoveAll(dir)
dbPath := path.Join(dir, "test_db") dbPath := path.Join(dir, "test_db")
db, err := Open(dbPath, false) db, err := Open(dbPath, false)

11
http/service_test.go
View File

@@ -1139,7 +1139,7 @@ func Test_TLSServce(t *testing.T) {
m := &MockStore{} m := &MockStore{}
c := &mockClusterService{} c := &mockClusterService{}
var s *Service var s *Service
tempDir := mustTempDir() tempDir := t.TempDir()
s = New("127.0.0.1:0", m, c, nil) s = New("127.0.0.1:0", m, c, nil)
s.CertFile = x509.CertFile(tempDir) s.CertFile = x509.CertFile(tempDir)
@@ -1370,15 +1370,6 @@ func mustNewHTTPRequest(url string) *http.Request {
return req return req
} }
func mustTempDir() string {
var err error
path, err := ioutil.TempDir("", "rqlilte-system-test-")
if err != nil {
panic("failed to create temp dir")
}
return path
}
func mustURLParse(s string) *url.URL { func mustURLParse(s string) *url.URL {
u, err := url.Parse(s) u, err := url.Parse(s)
if err != nil { if err != nil {

10
store/store_restart_test.go
View File

@@ -2,7 +2,6 @@ package store
import ( import (
"fmt" "fmt"
"os"
"testing" "testing"
"time" "time"
@@ -209,9 +208,8 @@ func openStoreCloseStartup(t *testing.T, s *Store) {
// Test_OpenStoreCloseStartupOnDiskSingleNode tests that the on-disk // Test_OpenStoreCloseStartupOnDiskSingleNode tests that the on-disk
// optimization can be disabled in various scenarios. // optimization can be disabled in various scenarios.
func Test_OpenStoreCloseStartupOnDiskSingleNode(t *testing.T) { func Test_OpenStoreCloseStartupOnDiskSingleNode(t *testing.T) {
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
s.StartupOnDisk = true s.StartupOnDisk = true
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
openStoreCloseStartup(t, s) openStoreCloseStartup(t, s)
@@ -220,9 +218,8 @@ func Test_OpenStoreCloseStartupOnDiskSingleNode(t *testing.T) {
// Test_OpenStoreCloseStartupMemorySingleNode tests that the on-disk // Test_OpenStoreCloseStartupMemorySingleNode tests that the on-disk
// optimization works fine. // optimization works fine.
func Test_OpenStoreCloseStartupMemorySingleNode(t *testing.T) { func Test_OpenStoreCloseStartupMemorySingleNode(t *testing.T) {
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
s.StartupOnDisk = false s.StartupOnDisk = false
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
openStoreCloseStartup(t, s) openStoreCloseStartup(t, s)
@@ -231,8 +228,7 @@ func Test_OpenStoreCloseStartupMemorySingleNode(t *testing.T) {
// Test_OpenStoreCloseStartupMemoryOnlySingleNode tests that in-memory // Test_OpenStoreCloseStartupMemoryOnlySingleNode tests that in-memory
// works fine during various restart scenarios. // works fine during various restart scenarios.
func Test_OpenStoreCloseStartupMemoryOnlySingleNode(t *testing.T) { func Test_OpenStoreCloseStartupMemoryOnlySingleNode(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
openStoreCloseStartup(t, s) openStoreCloseStartup(t, s)

154
store/store_test.go
View File

@@ -24,8 +24,7 @@ func init() {
} }
func Test_OpenStoreSingleNode(t *testing.T) { func Test_OpenStoreSingleNode(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -53,8 +52,7 @@ func Test_OpenStoreSingleNode(t *testing.T) {
} }
func Test_OpenStoreCloseSingleNode(t *testing.T) { func Test_OpenStoreCloseSingleNode(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -123,9 +121,8 @@ func Test_OpenStoreCloseSingleNode(t *testing.T) {
} }
func Test_StoreLeaderObservation(t *testing.T) { func Test_StoreLeaderObservation(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer s.Close(true) defer s.Close(true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -166,8 +163,7 @@ func Test_StoreLeaderObservation(t *testing.T) {
} }
func Test_SingleNodeInMemExecuteQuery(t *testing.T) { func Test_SingleNodeInMemExecuteQuery(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -207,8 +203,7 @@ func Test_SingleNodeInMemExecuteQuery(t *testing.T) {
// Test_SingleNodeInMemExecuteQueryFail ensures database level errors are presented by the store. // Test_SingleNodeInMemExecuteQueryFail ensures database level errors are presented by the store.
func Test_SingleNodeInMemExecuteQueryFail(t *testing.T) { func Test_SingleNodeInMemExecuteQueryFail(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -235,8 +230,7 @@ func Test_SingleNodeInMemExecuteQueryFail(t *testing.T) {
} }
func Test_SingleNodeFileExecuteQuery(t *testing.T) { func Test_SingleNodeFileExecuteQuery(t *testing.T) {
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -313,8 +307,7 @@ func Test_SingleNodeFileExecuteQuery(t *testing.T) {
} }
func Test_SingleNodeExecuteQueryTx(t *testing.T) { func Test_SingleNodeExecuteQueryTx(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -367,8 +360,7 @@ func Test_SingleNodeExecuteQueryTx(t *testing.T) {
// Test_SingleNodeInMemFK tests that basic foreign-key related functionality works. // Test_SingleNodeInMemFK tests that basic foreign-key related functionality works.
func Test_SingleNodeInMemFK(t *testing.T) { func Test_SingleNodeInMemFK(t *testing.T) {
s, ln := mustNewStoreFK(true) s, ln := mustNewStoreFK(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -400,8 +392,7 @@ func Test_SingleNodeInMemFK(t *testing.T) {
// Test_SingleNodeSQLitePath ensures that basic functionality works when the SQLite database path // Test_SingleNodeSQLitePath ensures that basic functionality works when the SQLite database path
// is explicitly specificed. // is explicitly specificed.
func Test_SingleNodeSQLitePath(t *testing.T) { func Test_SingleNodeSQLitePath(t *testing.T) {
s, ln, path := mustNewStoreSQLitePath() s, ln, path := mustNewStoreSQLitePath(t)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -446,8 +437,7 @@ func Test_SingleNodeSQLitePath(t *testing.T) {
func Test_SingleNodeBackupBinary(t *testing.T) { func Test_SingleNodeBackupBinary(t *testing.T) {
t.Parallel() t.Parallel()
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -500,8 +490,7 @@ COMMIT;
func Test_SingleNodeBackupText(t *testing.T) { func Test_SingleNodeBackupText(t *testing.T) {
t.Parallel() t.Parallel()
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -545,8 +534,7 @@ COMMIT;
} }
func Test_SingleNodeSingleCommandTrigger(t *testing.T) { func Test_SingleNodeSingleCommandTrigger(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -591,8 +579,7 @@ COMMIT;
} }
func Test_SingleNodeLoadText(t *testing.T) { func Test_SingleNodeLoadText(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -633,8 +620,7 @@ COMMIT;
} }
func Test_SingleNodeLoadTextNoStatements(t *testing.T) { func Test_SingleNodeLoadTextNoStatements(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -659,8 +645,7 @@ COMMIT;
} }
func Test_SingleNodeLoadTextEmpty(t *testing.T) { func Test_SingleNodeLoadTextEmpty(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -682,8 +667,7 @@ func Test_SingleNodeLoadTextEmpty(t *testing.T) {
} }
func Test_SingleNodeLoadTextChinook(t *testing.T) { func Test_SingleNodeLoadTextChinook(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -745,8 +729,7 @@ func Test_SingleNodeLoadTextChinook(t *testing.T) {
} }
func Test_SingleNodeLoadBinary(t *testing.T) { func Test_SingleNodeLoadBinary(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -832,8 +815,7 @@ COMMIT;
// Test_SingleNodeRecoverNoChange tests a node recovery that doesn't // Test_SingleNodeRecoverNoChange tests a node recovery that doesn't
// actually change anything. // actually change anything.
func Test_SingleNodeRecoverNoChange(t *testing.T) { func Test_SingleNodeRecoverNoChange(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -900,8 +882,7 @@ func Test_SingleNodeRecoverNoChange(t *testing.T) {
// Test_SingleNodeRecoverNetworkChange tests a node recovery that // Test_SingleNodeRecoverNetworkChange tests a node recovery that
// involves a changed-network address. // involves a changed-network address.
func Test_SingleNodeRecoverNetworkChange(t *testing.T) { func Test_SingleNodeRecoverNetworkChange(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -980,8 +961,7 @@ func Test_SingleNodeRecoverNetworkChange(t *testing.T) {
// Test_SingleNodeRecoverNetworkChangeSnapshot tests a node recovery that // Test_SingleNodeRecoverNetworkChangeSnapshot tests a node recovery that
// involves a changed-network address, with snapshots underneath. // involves a changed-network address, with snapshots underneath.
func Test_SingleNodeRecoverNetworkChangeSnapshot(t *testing.T) { func Test_SingleNodeRecoverNetworkChangeSnapshot(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
s0.SnapshotThreshold = 4 s0.SnapshotThreshold = 4
s0.SnapshotInterval = 100 * time.Millisecond s0.SnapshotInterval = 100 * time.Millisecond
@@ -1079,8 +1059,7 @@ func Test_SingleNodeRecoverNetworkChangeSnapshot(t *testing.T) {
} }
func Test_SingleNodeSelfJoinFail(t *testing.T) { func Test_SingleNodeSelfJoinFail(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1105,8 +1084,7 @@ func Test_SingleNodeSelfJoinFail(t *testing.T) {
} }
func Test_MultiNodeJoinRemove(t *testing.T) { func Test_MultiNodeJoinRemove(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1119,8 +1097,7 @@ func Test_MultiNodeJoinRemove(t *testing.T) {
t.Fatalf("Error waiting for leader: %s", err) t.Fatalf("Error waiting for leader: %s", err)
} }
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer os.RemoveAll(s1.Path())
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1185,24 +1162,21 @@ func Test_MultiNodeJoinRemove(t *testing.T) {
} }
func Test_MultiNodeStoreNotifyBootstrap(t *testing.T) { func Test_MultiNodeStoreNotifyBootstrap(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
} }
defer s0.Close(true) defer s0.Close(true)
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer os.RemoveAll(s1.Path())
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
} }
defer s1.Close(true) defer s1.Close(true)
s2, ln2 := mustNewStore(true) s2, ln2 := mustNewStore(t, true)
defer os.RemoveAll(s2.Path())
defer ln2.Close() defer ln2.Close()
if err := s2.Open(); err != nil { if err := s2.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1270,8 +1244,7 @@ func Test_MultiNodeStoreNotifyBootstrap(t *testing.T) {
} }
func Test_MultiNodeJoinNonVoterRemove(t *testing.T) { func Test_MultiNodeJoinNonVoterRemove(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1284,8 +1257,7 @@ func Test_MultiNodeJoinNonVoterRemove(t *testing.T) {
t.Fatalf("Error waiting for leader: %s", err) t.Fatalf("Error waiting for leader: %s", err)
} }
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer os.RemoveAll(s1.Path())
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1351,8 +1323,7 @@ func Test_MultiNodeJoinNonVoterRemove(t *testing.T) {
} }
func Test_MultiNodeExecuteQuery(t *testing.T) { func Test_MultiNodeExecuteQuery(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1365,16 +1336,14 @@ func Test_MultiNodeExecuteQuery(t *testing.T) {
t.Fatalf("Error waiting for leader: %s", err) t.Fatalf("Error waiting for leader: %s", err)
} }
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer os.RemoveAll(s1.Path())
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open node for multi-node test: %s", err.Error()) t.Fatalf("failed to open node for multi-node test: %s", err.Error())
} }
defer s1.Close(true) defer s1.Close(true)
s2, ln2 := mustNewStore(true) s2, ln2 := mustNewStore(t, true)
defer os.RemoveAll(s2.Path())
defer ln2.Close() defer ln2.Close()
if err := s2.Open(); err != nil { if err := s2.Open(); err != nil {
t.Fatalf("failed to open node for multi-node test: %s", err.Error()) t.Fatalf("failed to open node for multi-node test: %s", err.Error())
@@ -1476,8 +1445,7 @@ func Test_MultiNodeExecuteQuery(t *testing.T) {
// Test_SingleNodeExecuteQueryFreshness tests that freshness is ignored on the Leader. // Test_SingleNodeExecuteQueryFreshness tests that freshness is ignored on the Leader.
func Test_SingleNodeExecuteQueryFreshness(t *testing.T) { func Test_SingleNodeExecuteQueryFreshness(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1519,8 +1487,7 @@ func Test_SingleNodeExecuteQueryFreshness(t *testing.T) {
} }
func Test_MultiNodeExecuteQueryFreshness(t *testing.T) { func Test_MultiNodeExecuteQueryFreshness(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
if err := s0.Open(); err != nil { if err := s0.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1533,8 +1500,7 @@ func Test_MultiNodeExecuteQueryFreshness(t *testing.T) {
t.Fatalf("Error waiting for leader: %s", err) t.Fatalf("Error waiting for leader: %s", err)
} }
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer os.RemoveAll(s1.Path())
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open node for multi-node test: %s", err.Error()) t.Fatalf("failed to open node for multi-node test: %s", err.Error())
@@ -1651,8 +1617,7 @@ func Test_MultiNodeExecuteQueryFreshness(t *testing.T) {
} }
func Test_StoreLogTruncationMultinode(t *testing.T) { func Test_StoreLogTruncationMultinode(t *testing.T) {
s0, ln0 := mustNewStore(true) s0, ln0 := mustNewStore(t, true)
defer os.RemoveAll(s0.Path())
defer ln0.Close() defer ln0.Close()
s0.SnapshotThreshold = 4 s0.SnapshotThreshold = 4
s0.SnapshotInterval = 100 * time.Millisecond s0.SnapshotInterval = 100 * time.Millisecond
@@ -1701,7 +1666,7 @@ func Test_StoreLogTruncationMultinode(t *testing.T) {
// Fire up new node and ensure it picks up all changes. This will // Fire up new node and ensure it picks up all changes. This will
// involve getting a snapshot and truncated log. // involve getting a snapshot and truncated log.
s1, ln1 := mustNewStore(true) s1, ln1 := mustNewStore(t, true)
defer ln1.Close() defer ln1.Close()
if err := s1.Open(); err != nil { if err := s1.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1735,8 +1700,7 @@ func Test_StoreLogTruncationMultinode(t *testing.T) {
} }
func Test_SingleNodeSnapshotOnDisk(t *testing.T) { func Test_SingleNodeSnapshotOnDisk(t *testing.T) {
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -1769,8 +1733,7 @@ func Test_SingleNodeSnapshotOnDisk(t *testing.T) {
t.Fatalf("failed to snapshot node: %s", err.Error()) t.Fatalf("failed to snapshot node: %s", err.Error())
} }
snapDir := mustTempDir() snapDir := t.TempDir()
defer os.RemoveAll(snapDir)
snapFile, err := os.Create(filepath.Join(snapDir, "snapshot")) snapFile, err := os.Create(filepath.Join(snapDir, "snapshot"))
if err != nil { if err != nil {
t.Fatalf("failed to create snapshot file: %s", err.Error()) t.Fatalf("failed to create snapshot file: %s", err.Error())
@@ -1803,8 +1766,7 @@ func Test_SingleNodeSnapshotOnDisk(t *testing.T) {
} }
func Test_SingleNodeSnapshotInMem(t *testing.T) { func Test_SingleNodeSnapshotInMem(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -1837,8 +1799,7 @@ func Test_SingleNodeSnapshotInMem(t *testing.T) {
t.Fatalf("failed to snapshot node: %s", err.Error()) t.Fatalf("failed to snapshot node: %s", err.Error())
} }
snapDir := mustTempDir() snapDir := t.TempDir()
defer os.RemoveAll(snapDir)
snapFile, err := os.Create(filepath.Join(snapDir, "snapshot")) snapFile, err := os.Create(filepath.Join(snapDir, "snapshot"))
if err != nil { if err != nil {
t.Fatalf("failed to create snapshot file: %s", err.Error()) t.Fatalf("failed to create snapshot file: %s", err.Error())
@@ -1888,8 +1849,7 @@ func Test_SingleNodeSnapshotInMem(t *testing.T) {
} }
func Test_SingleNodeRestoreNoncompressed(t *testing.T) { func Test_SingleNodeRestoreNoncompressed(t *testing.T) {
s, ln := mustNewStore(false) s, ln := mustNewStore(t, false)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -1927,8 +1887,7 @@ func Test_SingleNodeRestoreNoncompressed(t *testing.T) {
} }
func Test_SingleNodeNoop(t *testing.T) { func Test_SingleNodeNoop(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
t.Fatalf("failed to open single-node store: %s", err.Error()) t.Fatalf("failed to open single-node store: %s", err.Error())
@@ -1950,8 +1909,7 @@ func Test_SingleNodeNoop(t *testing.T) {
} }
func Test_IsLeader(t *testing.T) { func Test_IsLeader(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -1971,8 +1929,7 @@ func Test_IsLeader(t *testing.T) {
} }
func Test_State(t *testing.T) { func Test_State(t *testing.T) {
s, ln := mustNewStore(true) s, ln := mustNewStore(t, true)
defer os.RemoveAll(s.Path())
defer ln.Close() defer ln.Close()
if err := s.Open(); err != nil { if err := s.Open(); err != nil {
@@ -2009,17 +1966,17 @@ func mustNewStoreAtPathsLn(id, dataPath, sqlitePath string, inmem, fk bool) (*St
return s, ln return s, ln
} }
func mustNewStore(inmem bool) (*Store, net.Listener) { func mustNewStore(t *testing.T, inmem bool) (*Store, net.Listener) {
return mustNewStoreAtPathsLn(randomString(), mustTempDir(), "", inmem, false) return mustNewStoreAtPathsLn(randomString(), t.TempDir(), "", inmem, false)
} }
func mustNewStoreFK(inmem bool) (*Store, net.Listener) { func mustNewStoreFK(t *testing.T, inmem bool) (*Store, net.Listener) {
return mustNewStoreAtPathsLn(randomString(), mustTempDir(), "", inmem, true) return mustNewStoreAtPathsLn(randomString(), t.TempDir(), "", inmem, true)
} }
func mustNewStoreSQLitePath() (*Store, net.Listener, string) { func mustNewStoreSQLitePath(t *testing.T) (*Store, net.Listener, string) {
dataDir := mustTempDir() dataDir := t.TempDir()
sqliteDir := mustTempDir() sqliteDir := t.TempDir()
sqlitePath := filepath.Join(sqliteDir, "explicit-path.db") sqlitePath := filepath.Join(sqliteDir, "explicit-path.db")
s, ln := mustNewStoreAtPathsLn(randomString(), dataDir, sqlitePath, false, true) s, ln := mustNewStoreAtPathsLn(randomString(), dataDir, sqlitePath, false, true)
return s, ln, sqlitePath return s, ln, sqlitePath
@@ -2078,15 +2035,6 @@ func mustReadFile(path string) []byte {
return b return b
} }
func mustTempDir() string {
var err error
path, err := ioutil.TempDir("", "rqlilte-test-")
if err != nil {
panic("failed to create temp dir")
}
return path
}
func mustParseDuration(t string) time.Duration { func mustParseDuration(t string) time.Duration {
d, err := time.ParseDuration(t) d, err := time.ParseDuration(t)
if err != nil { if err != nil {