diff --git a/e2e/ctl_v3_user_test.go b/e2e/ctl_v3_user_test.go index 392ab4e42..a6107db20 100644 --- a/e2e/ctl_v3_user_test.go +++ b/e2e/ctl_v3_user_test.go @@ -21,9 +21,30 @@ func TestCtlV3UserAddNoTLS(t *testing.T) { testCtl(t, userAddTest, withCfg(c 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) } +func TestCtlV3UserAddClientAutoTLS(t *testing.T) { + testCtl(t, userAddTest, withCfg(configClientAutoTLS)) +} +func TestCtlV3UserList(t *testing.T) { testCtl(t, userListTest) } +func TestCtlV3UserListNoTLS(t *testing.T) { testCtl(t, userListTest, withCfg(configNoTLS)) } +func TestCtlV3UserListClientTLS(t *testing.T) { testCtl(t, userListTest, withCfg(configClientTLS)) } +func TestCtlV3UserListPeerTLS(t *testing.T) { testCtl(t, userListTest, withCfg(configPeerTLS)) } +func TestCtlV3UserListClientAutoTLS(t *testing.T) { + testCtl(t, userListTest, withCfg(configClientAutoTLS)) +} +func TestCtlV3UserDelete(t *testing.T) { testCtl(t, userDelTest) } +func TestCtlV3UserDeleteNoTLS(t *testing.T) { testCtl(t, userDelTest, withCfg(configNoTLS)) } +func TestCtlV3UserDeleteClientTLS(t *testing.T) { testCtl(t, userDelTest, withCfg(configClientTLS)) } +func TestCtlV3UserDeletePeerTLS(t *testing.T) { testCtl(t, userDelTest, withCfg(configPeerTLS)) } +func TestCtlV3UserDeleteClientAutoTLS(t *testing.T) { + testCtl(t, userDelTest, withCfg(configClientAutoTLS)) +} +func TestCtlV3UserPasswd(t *testing.T) { testCtl(t, userPasswdTest) } +func TestCtlV3UserPasswdNoTLS(t *testing.T) { testCtl(t, userPasswdTest, withCfg(configNoTLS)) } +func TestCtlV3UserPasswdClientTLS(t *testing.T) { testCtl(t, userPasswdTest, withCfg(configClientTLS)) } +func TestCtlV3UserPasswdPeerTLS(t *testing.T) { testCtl(t, userPasswdTest, withCfg(configPeerTLS)) } +func TestCtlV3UserPasswdClientAutoTLS(t *testing.T) { + testCtl(t, userPasswdTest, withCfg(configClientAutoTLS)) +} type userCmdDesc struct { args []string @@ -68,6 +89,28 @@ func userAddTest(cx ctlCtx) { } } +func userListTest(cx ctlCtx) { + cmdSet := []userCmdDesc{ + // Adds a user name. + { + args: []string{"add", "username", "--interactive=false"}, + expectedStr: "User username created", + stdIn: []string{"password"}, + }, + // List user name + { + args: []string{"list"}, + expectedStr: "username", + }, + } + + for i, cmd := range cmdSet { + if err := ctlV3User(cx, cmd.args, cmd.expectedStr, cmd.stdIn); err != nil { + cx.t.Fatalf("userListTest #%d: ctlV3User error (%v)", i, err) + } + } +} + func userDelTest(cx ctlCtx) { cmdSet := []userCmdDesc{ // Adds a user name.