Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: use "snapshot.Status"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-01-22 15:09:48 -08:00
parent 6e2555fb95
commit 8b317df97a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
e2e/ctl_v3_snapshot_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/coreos/etcd/pkg/expect" "github.com/coreos/etcd/pkg/expect"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/snapshot"
) )
func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) } func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) }
@ -127,33 +128,26 @@ func ctlV3SnapshotSave(cx ctlCtx, fpath string) error {
return spawnWithExpect(cmdArgs, fmt.Sprintf("Snapshot saved at %s", fpath)) return spawnWithExpect(cmdArgs, fmt.Sprintf("Snapshot saved at %s", fpath))
} }
type snapshotStatus struct { func getSnapshotStatus(cx ctlCtx, fpath string) (snapshot.Status, error) {
Hash uint32 `json:"hash"`
Revision int64 `json:"revision"`
TotalKey int `json:"totalKey"`
TotalSize int64 `json:"totalSize"`
}
func getSnapshotStatus(cx ctlCtx, fpath string) (snapshotStatus, error) {
cmdArgs := append(cx.PrefixArgs(), "--write-out", "json", "snapshot", "status", fpath) cmdArgs := append(cx.PrefixArgs(), "--write-out", "json", "snapshot", "status", fpath)
proc, err := spawnCmd(cmdArgs) proc, err := spawnCmd(cmdArgs)
if err != nil { if err != nil {
return snapshotStatus{}, err return snapshot.Status{}, err
} }
var txt string var txt string
txt, err = proc.Expect("totalKey") txt, err = proc.Expect("totalKey")
if err != nil { if err != nil {
return snapshotStatus{}, err return snapshot.Status{}, err
} }
if err = proc.Close(); err != nil { if err = proc.Close(); err != nil {
return snapshotStatus{}, err return snapshot.Status{}, err
} }
resp := snapshotStatus{} resp := snapshot.Status{}
dec := json.NewDecoder(strings.NewReader(txt)) dec := json.NewDecoder(strings.NewReader(txt))
if err := dec.Decode(&resp); err == io.EOF { if err := dec.Decode(&resp); err == io.EOF {
return snapshotStatus{}, err return snapshot.Status{}, err
} }
return resp, nil return resp, nil
} }