vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

snapshot: use "pkg/logger.NewPackageLogger" 

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
release-3.4
Gyuho Lee 2018-02-05 14:32:26 -08:00
parent a2ce52d8c2
commit 7ba860ed19
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snapshot/v3_snapshot_test.go
View File

@ -29,8 +29,6 @@ import (
"github.com/coreos/etcd/pkg/logger"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/pkg/capnslog"
)
// TestSnapshotV3RestoreSingle tests single node cluster restoring
@ -53,7 +51,7 @@ func TestSnapshotV3RestoreSingle(t *testing.T) {
cfg.InitialCluster = fmt.Sprintf("%s=%s", cfg.Name, pURLs[0].String())
cfg.Dir = filepath.Join(os.TempDir(), fmt.Sprint(time.Now().Nanosecond()))
sp := NewV3(nil, logger.NewPackageLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot")))
sp := NewV3(nil, logger.NewPackageLogger("github.com/coreos/etcd", "snapshot"))
err := sp.Restore(dbPath, RestoreConfig{})
if err.Error() != `couldn't find local name "" in the initial cluster configuration` {
@ -190,7 +188,7 @@ func createSnapshotFile(t *testing.T, kvs []kv) string {
}
}
sp := NewV3(cli, logger.NewPackageLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot")))
sp := NewV3(cli, logger.NewPackageLogger("github.com/coreos/etcd", "snapshot"))
dpPath := filepath.Join(os.TempDir(), fmt.Sprintf("snapshot%d.db", time.Now().Nanosecond()))
if err = sp.Save(context.Background(), dpPath); err != nil {
t.Fatal(err)
@ -231,7 +229,7 @@ func restoreCluster(t *testing.T, clusterN int, dbPath string) (
cfg.InitialCluster = ics
cfg.Dir = filepath.Join(os.TempDir(), fmt.Sprint(time.Now().Nanosecond()+i))
sp := NewV3(nil, logger.NewPackageLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot")))
sp := NewV3(nil, logger.NewPackageLogger("github.com/coreos/etcd", "snapshot"))
if err := sp.Restore(dbPath, RestoreConfig{
Name: cfg.Name,
OutputDataDir: cfg.Dir,