From bb0e144b43f9252dadfb877ce92f1c7cc1623c41 Mon Sep 17 00:00:00 2001 From: fanmin shi Date: Fri, 21 Jul 2017 14:31:39 -0700 Subject: [PATCH 1/2] etcdctl: print "del" instead of "delete" in txn interactive mode --- etcdctl/ctlv3/command/txn_command.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index d5e75b05b47..aa8491be3ed 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -52,9 +52,9 @@ func txnCommandFunc(cmd *cobra.Command, args []string) { txn := mustClientFromCmd(cmd).Txn(context.Background()) promptInteractive("compares:") txn.If(readCompares(reader)...) - promptInteractive("success requests (get, put, delete):") + promptInteractive("success requests (get, put, del):") txn.Then(readOps(reader)...) - promptInteractive("failure requests (get, put, delete):") + promptInteractive("failure requests (get, put, del):") txn.Else(readOps(reader)...) resp, err := txn.Commit() From 09f67a0d5e6a860a18828f838e9e80c13cb61afc Mon Sep 17 00:00:00 2001 From: fanmin shi Date: Mon, 24 Jul 2017 10:51:31 -0700 Subject: [PATCH 2/2] e2e: change expectatation string in ctlTxn --- e2e/ctl_v3_txn_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/ctl_v3_txn_test.go b/e2e/ctl_v3_txn_test.go index c6e0b12de58..960e7c06bd0 100644 --- a/e2e/ctl_v3_txn_test.go +++ b/e2e/ctl_v3_txn_test.go @@ -119,7 +119,7 @@ func ctlV3Txn(cx ctlCtx, rqs txnRequests) error { return err } - _, err = proc.Expect("success requests (get, put, delete):") + _, err = proc.Expect("success requests (get, put, del):") if err != nil { return err } @@ -132,7 +132,7 @@ func ctlV3Txn(cx ctlCtx, rqs txnRequests) error { return err } - _, err = proc.Expect("failure requests (get, put, delete):") + _, err = proc.Expect("failure requests (get, put, del):") if err != nil { return err }