forked from etcd-io/etcd
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix etcd-io#4836.
- Loading branch information
Showing
5 changed files
with
168 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // 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 ( | ||
| "fmt" | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/coreos/etcd/pkg/fileutil" | ||
| "github.com/coreos/etcd/pkg/testutil" | ||
| ) | ||
|
|
||
| func TestCtlV3SetQuorum(t *testing.T) { | ||
| checkTesting(t, testCtlV3Set(t, &configNoTLS, 5*time.Second, true)) | ||
| } | ||
|
|
||
| func TestCtlV3SetQuorumTimeout(t *testing.T) { | ||
| err := testCtlV3Set(t, &configNoTLS, time.Nanosecond, true) | ||
| if !strings.Contains(err.Error(), "grpc: timed out trying to connect") { | ||
| t.Fatalf("expected timeout error, got %v", err) | ||
| } | ||
| } | ||
|
|
||
| // TODO: Getting transport: x509: certificate signed by unknown authority | ||
| // func TestCtlV3SetClientTLSQuorum(t *testing.T) { | ||
| // checkTesting(t, testCtlV3Set(t, &configClientTLS, 5*time.Second, true)) | ||
| // } | ||
|
|
||
| func TestCtlV3SetPeerTLSQuorum(t *testing.T) { | ||
| checkTesting(t, testCtlV3Set(t, &configPeerTLS, 5*time.Second, true)) | ||
| } | ||
|
|
||
| // TODO: Getting transport: x509: certificate signed by unknown authority | ||
| // func TestCtlV3SetTLSQuorum(t *testing.T) { | ||
| // checkTesting(t, testCtlV3Set(t, &configTLS, 5*time.Second, true)) | ||
| // } | ||
|
|
||
| func checkTesting(t *testing.T, err error) { | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func stripSchema(s string) string { | ||
| if strings.HasPrefix(s, "http://") { | ||
| s = strings.Replace(s, "http://", "", -1) | ||
| } | ||
| if strings.HasPrefix(s, "https://") { | ||
| s = strings.Replace(s, "https://", "", -1) | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| func testCtlV3Set(t *testing.T, cfg *etcdProcessClusterConfig, dialTimeout time.Duration, quorum bool) error { | ||
| defer testutil.AfterTest(t) | ||
|
|
||
| epc := setupEtcdctlV3Test(t, cfg, quorum) | ||
| defer func() { | ||
| if errC := epc.Close(); errC != nil { | ||
| t.Fatalf("error closing etcd processes (%v)", errC) | ||
| } | ||
| }() | ||
|
|
||
| key, value := "foo", "bar" | ||
|
|
||
| if err := etcdctlV3Put(epc, key, value, dialTimeout); err != nil { | ||
| return fmt.Errorf("put error (%v)", err) | ||
| } | ||
|
|
||
| if err := etcdctlV3Get(epc, key, value, dialTimeout, quorum); err != nil { | ||
| return fmt.Errorf("get error (%v)", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func etcdctlV3PrefixArgs(clus *etcdProcessCluster, dialTimeout time.Duration) []string { | ||
| endpoints := "" | ||
| // TODO: add proxy check as in v2 | ||
| if backends := clus.backends(); len(backends) != 0 { | ||
| es := []string{} | ||
| for _, b := range backends { | ||
| es = append(es, stripSchema(b.cfg.acurl.String())) | ||
| } | ||
| endpoints = strings.Join(es, ",") | ||
| } | ||
| cmdArgs := []string{"../bin/etcdctlv3", "--endpoints", endpoints, "--dial-timeout", dialTimeout.String()} | ||
| if clus.cfg.isClientTLS { | ||
| cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath, "--key", privateKeyPath) | ||
| } | ||
| return cmdArgs | ||
| } | ||
|
|
||
| func etcdctlV3Put(clus *etcdProcessCluster, key, value string, dialTimeout time.Duration) error { | ||
| cmdArgs := append(etcdctlV3PrefixArgs(clus, dialTimeout), "put", key, value) | ||
| return spawnWithExpectedString(cmdArgs, "OK") | ||
| } | ||
|
|
||
| func etcdctlV3Get(clus *etcdProcessCluster, key, value string, dialTimeout time.Duration, quorum bool) error { | ||
| // TODO: add serialized option | ||
| // if quorum {} | ||
|
|
||
| cmdArgs := append(etcdctlV3PrefixArgs(clus, dialTimeout), "get", key) | ||
|
|
||
| // TODO: match by value. Currently it prints out both key and value in multi-lines | ||
| return spawnWithExpectedString(cmdArgs, key) | ||
| } | ||
|
|
||
| func mustEtcdctlV3(t *testing.T) { | ||
| if !fileutil.Exist("../bin/etcdctlv3") { | ||
| t.Fatalf("could not find etcdctlv3 binary") | ||
| } | ||
| } | ||
|
|
||
| func setupEtcdctlV3Test(t *testing.T, cfg *etcdProcessClusterConfig, quorum bool) *etcdProcessCluster { | ||
| // TODO: add serialized option | ||
| // if quorum {} | ||
|
|
||
| mustEtcdctlV3(t) | ||
| if !quorum { | ||
| cfg = configStandalone(*cfg) | ||
| } | ||
| cfg.isV3 = true | ||
| epc, err := newEtcdProcessCluster(cfg) | ||
| if err != nil { | ||
| t.Fatalf("could not start etcd process cluster (%v)", err) | ||
| } | ||
| return epc | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters