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

Merge pull request #8297 from fanminshi/fix_txn_ctl 

etcdctl:  print "del" instead of "delete" in txn interactive mode
release-3.3
fanmin shi 2017-07-24 14:05:14 -07:00 committed by GitHub
parent e9a7f3551b 09f67a0d5e
commit dfd3ef42cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/ctl_v3_txn_test.go
View File

@ -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
}

4
etcdctl/ctlv3/command/txn_command.go
View File

@ -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()