Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

etcdctl: print "del" instead of "delete" in txn interactive mode #8297

Merged
merged 2 commits into from
Jul 24, 2017
Merged

etcdctl: print "del" instead of "delete" in txn interactive mode #8297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0e144
etcdctl: print "del" instead of "delete" in txn interactive mode
fanminshi Jul 21, 2017
09f67a0
e2e: change expectatation string in ctlTxn
fanminshi Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e/ctl_v3_txn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions etcdctl/ctlv3/command/txn_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down