From 2b0e7853675ee92e19f9bff0edbc40520001b7b8 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 8 Jan 2018 03:04:51 -0800 Subject: [PATCH] e2e: use "snapshot.DBStatus" Signed-off-by: Gyuho Lee --- e2e/ctl_v3_snapshot_test.go | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/e2e/ctl_v3_snapshot_test.go b/e2e/ctl_v3_snapshot_test.go index ed09045ebc27..be7efa877271 100644 --- a/e2e/ctl_v3_snapshot_test.go +++ b/e2e/ctl_v3_snapshot_test.go @@ -27,6 +27,7 @@ import ( "github.com/coreos/etcd/pkg/expect" "github.com/coreos/etcd/pkg/testutil" + "github.com/coreos/etcd/snapshot" ) 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)) } -type snapshotStatus struct { - Hash uint32 `json:"hash"` - Revision int64 `json:"revision"` - TotalKey int `json:"totalKey"` - TotalSize int64 `json:"totalSize"` -} - -func getSnapshotStatus(cx ctlCtx, fpath string) (snapshotStatus, error) { +func getSnapshotStatus(cx ctlCtx, fpath string) (snapshot.DBStatus, error) { cmdArgs := append(cx.PrefixArgs(), "--write-out", "json", "snapshot", "status", fpath) proc, err := spawnCmd(cmdArgs) if err != nil { - return snapshotStatus{}, err + return snapshot.DBStatus{}, err } var txt string txt, err = proc.Expect("totalKey") if err != nil { - return snapshotStatus{}, err + return snapshot.DBStatus{}, err } if err = proc.Close(); err != nil { - return snapshotStatus{}, err + return snapshot.DBStatus{}, err } - resp := snapshotStatus{} + resp := snapshot.DBStatus{} dec := json.NewDecoder(strings.NewReader(txt)) if err := dec.Decode(&resp); err == io.EOF { - return snapshotStatus{}, err + return snapshot.DBStatus{}, err } return resp, nil }