tests/e2e: test move-leader command with TLS

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-06-05 13:32:43 -07:00
parent 94f2e450dd
commit 6d9cb7ac9a

View File

@ -16,6 +16,7 @@ package e2e
import ( import (
"context" "context"
"crypto/tls"
"fmt" "fmt"
"os" "os"
"testing" "testing"
@ -23,19 +24,42 @@ import (
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
) )
func TestCtlV3MoveLeader(t *testing.T) { func TestCtlV3MoveLeaderSecure(t *testing.T) {
testCtlV3MoveLeader(t, configTLS)
}
func TestCtlV3MoveLeaderInsecure(t *testing.T) {
testCtlV3MoveLeader(t, configNoTLS)
}
func testCtlV3MoveLeader(t *testing.T, cfg etcdProcessClusterConfig) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
epc := setupEtcdctlTest(t, &configNoTLS, true) epc := setupEtcdctlTest(t, &cfg, true)
defer func() { defer func() {
if errC := epc.Close(); errC != nil { if errC := epc.Close(); errC != nil {
t.Fatalf("error closing etcd processes (%v)", errC) t.Fatalf("error closing etcd processes (%v)", errC)
} }
}() }()
var tcfg *tls.Config
if cfg.clientTLS == clientTLS {
tinfo := transport.TLSInfo{
CertFile: certPath,
KeyFile: privateKeyPath,
TrustedCAFile: caPath,
}
var err error
tcfg, err = tinfo.ClientConfig()
if err != nil {
t.Fatal(err)
}
}
var leadIdx int var leadIdx int
var leaderID uint64 var leaderID uint64
var transferee uint64 var transferee uint64
@ -43,6 +67,7 @@ func TestCtlV3MoveLeader(t *testing.T) {
cli, err := clientv3.New(clientv3.Config{ cli, err := clientv3.New(clientv3.Config{
Endpoints: []string{ep}, Endpoints: []string{ep},
DialTimeout: 3 * time.Second, DialTimeout: 3 * time.Second,
TLS: tcfg,
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)