e2e: Test cases for the etcdctlv3 user commands.

New test cases have been added to test the "user" sub-commands of
the etcdctlv3 utility.

e2e/ctl_v3_user_test.go

@@ -0,0 +1,133 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package e2e
+
+import "testing"
+
+func TestCtlV3UserAdd(t *testing.T)          { testCtl(t, userAddTest) }
+func TestCtlV3UserAddNoTLS(t *testing.T)     { testCtl(t, userAddTest, withCfg(configNoTLS)) }
+func TestCtlV3UserAddClientTLS(t *testing.T) { testCtl(t, userAddTest, withCfg(configClientTLS)) }
+func TestCtlV3UserAddPeerTLS(t *testing.T)   { testCtl(t, userAddTest, withCfg(configPeerTLS)) }
+func TestCtlV3UserAddTimeout(t *testing.T)   { testCtl(t, userAddTest, withDialTimeout(0)) }
+
+func TestCtlV3UserDelete(t *testing.T) { testCtl(t, userDelTest) }
+func TestCtlV3UserPasswd(t *testing.T) { testCtl(t, userPasswdTest) }
+
+type userCmdDesc struct {
+	args        []string
+	expectedStr string
+	stdIn       []string
+}
+
+func userAddTest(cx ctlCtx) {
+	defer close(cx.errc)
+
+	cmdSet := []userCmdDesc{
+		// Adds a user name.
+		{
+			args:        []string{"add", "username", "--interactive=false"},
+			expectedStr: "User username created",
+			stdIn:       []string{"password"},
+		},
+		// Tries to add a user name that already exists.
+		{
+			args:        []string{"add", "username", "--interactive=false"},
+			expectedStr: "user name already exists",
+			stdIn:       []string{"password"},
+		},
+	}
+
+	for i, cmd := range cmdSet {
+		if err := ctlV3User(cx, cmd.args, cmd.expectedStr, cmd.stdIn); err != nil {
+			if cx.dialTimeout > 0 && !isGRPCTimedout(err) {
+				cx.t.Fatalf("userAddTest #%d: ctlV3User error (%v)", i, err)
+			}
+		}
+	}
+}
+
+func userDelTest(cx ctlCtx) {
+	defer close(cx.errc)
+
+	cmdSet := []userCmdDesc{
+		// Adds a user name.
+		{
+			args:        []string{"add", "username", "--interactive=false"},
+			expectedStr: "User username created",
+			stdIn:       []string{"password"},
+		},
+		// Deletes the user name just added.
+		{
+			args:        []string{"delete", "username"},
+			expectedStr: "User username deleted",
+		},
+		// Deletes a user name that is not present.
+		{
+			args:        []string{"delete", "username"},
+			expectedStr: "user name not found",
+		},
+	}
+
+	for i, cmd := range cmdSet {
+		if err := ctlV3User(cx, cmd.args, cmd.expectedStr, cmd.stdIn); err != nil {
+			cx.t.Fatalf("userDelTest #%d: ctlV3User error (%v)", i, err)
+		}
+	}
+}
+
+func userPasswdTest(cx ctlCtx) {
+	defer close(cx.errc)
+
+	cmdSet := []userCmdDesc{
+		// Adds a user name.
+		{
+			args:        []string{"add", "username", "--interactive=false"},
+			expectedStr: "User username created",
+			stdIn:       []string{"password"},
+		},
+		// Changes the password.
+		{
+			args:        []string{"passwd", "username", "--interactive=false"},
+			expectedStr: "Password updated",
+			stdIn:       []string{"password1"},
+		},
+	}
+
+	for i, cmd := range cmdSet {
+		if err := ctlV3User(cx, cmd.args, cmd.expectedStr, cmd.stdIn); err != nil {
+			cx.t.Fatalf("userPasswdTest #%d: ctlV3User error (%v)", i, err)
+		}
+	}
+}
+
+func ctlV3User(cx ctlCtx, args []string, expStr string, stdIn []string) error {
+	cmdArgs := append(ctlV3PrefixArgs(cx.epc, cx.dialTimeout), "user")
+	cmdArgs = append(cmdArgs, args...)
+
+	proc, err := spawnCmd(cmdArgs)
+	if err != nil {
+		return err
+	}
+
+	// Send 'stdIn' strings as input.
+	for _, s := range stdIn {
+		if err = proc.Send(s + "\r"); err != nil {
+			return err
+		}
+	}
+
+	_, err = proc.Expect(expStr)
+	return err
+}