Browse Source

e2e: fix typo(isClientAuthTLS to isClientAutoTLS)

Gyu-Ho Lee 9 years ago
parent
commit
63e6228a0b
2 changed files with 4 additions and 4 deletions
  1. 1 1
      e2e/ctl_v3_test.go
  2. 3 3
      e2e/etcd_test.go

+ 1 - 1
e2e/ctl_v3_test.go

@@ -140,7 +140,7 @@ func (cx *ctlCtx) PrefixArgs() []string {
 	}
 	}
 	cmdArgs := []string{"../bin/etcdctl", "--endpoints", endpoints, "--dial-timeout", cx.dialTimeout.String()}
 	cmdArgs := []string{"../bin/etcdctl", "--endpoints", endpoints, "--dial-timeout", cx.dialTimeout.String()}
 	if cx.epc.cfg.clientTLS == clientTLS {
 	if cx.epc.cfg.clientTLS == clientTLS {
-		if cx.epc.cfg.isClientAuthTLS {
+		if cx.epc.cfg.isClientAutoTLS {
 			cmdArgs = append(cmdArgs, "--insecure-transport=false", "--insecure-skip-tls-verify")
 			cmdArgs = append(cmdArgs, "--insecure-transport=false", "--insecure-skip-tls-verify")
 		} else {
 		} else {
 			cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath, "--key", privateKeyPath)
 			cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath, "--key", privateKeyPath)

+ 3 - 3
e2e/etcd_test.go

@@ -74,7 +74,7 @@ var (
 	configClientAutoTLS = etcdProcessClusterConfig{
 	configClientAutoTLS = etcdProcessClusterConfig{
 		clusterSize:     1,
 		clusterSize:     1,
 		proxySize:       0,
 		proxySize:       0,
-		isClientAuthTLS: true,
+		isClientAutoTLS: true,
 		clientTLS:       clientTLS,
 		clientTLS:       clientTLS,
 		initialToken:    "new",
 		initialToken:    "new",
 	}
 	}
@@ -138,7 +138,7 @@ type etcdProcessClusterConfig struct {
 	clientTLS         clientConnType
 	clientTLS         clientConnType
 	isPeerTLS         bool
 	isPeerTLS         bool
 	isPeerAutoTLS     bool
 	isPeerAutoTLS     bool
-	isClientAuthTLS   bool
+	isClientAutoTLS   bool
 	initialToken      string
 	initialToken      string
 	quotaBackendBytes int64
 	quotaBackendBytes int64
 }
 }
@@ -296,7 +296,7 @@ func (cfg *etcdProcessClusterConfig) etcdProcessConfigs() []*etcdProcessConfig {
 
 
 func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
 func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
 	if cfg.clientTLS != clientNonTLS {
 	if cfg.clientTLS != clientNonTLS {
-		if cfg.isClientAuthTLS {
+		if cfg.isClientAutoTLS {
 			args = append(args, "--auto-tls=true")
 			args = append(args, "--auto-tls=true")
 		} else {
 		} else {
 			tlsClientArgs := []string{
 			tlsClientArgs := []string{