Add an integration test for etcd

test/integration/doc.go

@@ -0,0 +1,20 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+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 integration provides integration tests for Kubernetes.  Use the integration
+// build tag during `go test` to start the tests.  Some tests require a running etcd
+// or Docker installation on the system which you can skip with no-docker and no-etcd.
+package integration

test/integration/etcd_tools_test.go

@@ -0,0 +1,135 @@
+// +build integration,!no-etcd
+
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+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 integration
+
+import (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+func init() {
+	requireEtcd()
+}
+
+type stringCodec struct{}
+
+func (c stringCodec) Encode(obj interface{}) ([]byte, error) {
+	return []byte(obj.(string)), nil
+}
+
+func (c stringCodec) Decode(data []byte) (interface{}, error) {
+	return string(data), nil
+}
+
+func (c stringCodec) DecodeInto(data []byte, obj interface{}) error {
+	o := obj.(*string)
+	*o = string(data)
+	return nil
+}
+
+func TestSetObj(t *testing.T) {
+	client := newEtcdClient()
+	helper := tools.EtcdHelper{Client: client, Codec: stringCodec{}}
+	withEtcdKey(func(key string) {
+		if err := helper.SetObj(key, "object"); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		resp, err := client.Get(key, false, false)
+		if err != nil || resp.Node == nil {
+			t.Fatalf("unexpected error: %v %v", err, resp)
+		}
+		if resp.Node.Value != "object" {
+			t.Errorf("unexpected response: %#v", resp.Node)
+		}
+	})
+}
+
+func TestExtractObj(t *testing.T) {
+	client := newEtcdClient()
+	helper := tools.EtcdHelper{Client: client, Codec: stringCodec{}}
+	withEtcdKey(func(key string) {
+		_, err := client.Set(key, "object", 0)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		s := ""
+		if err := helper.ExtractObj(key, &s, false); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if s != "object" {
+			t.Errorf("unexpected response: %#v", s)
+		}
+	})
+}
+
+func TestWatch(t *testing.T) {
+	client := newEtcdClient()
+	helper := tools.EtcdHelper{Client: client, Codec: api.Codec, ResourceVersioner: api.ResourceVersioner}
+	withEtcdKey(func(key string) {
+		resp, err := client.Set(key, api.EncodeOrDie(api.Pod{JSONBase: api.JSONBase{ID: "foo"}}), 0)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		expectedVersion := resp.Node.ModifiedIndex
+
+		// watch should load the object at the current index
+		w, err := helper.Watch(key, 0)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		event := <-w.ResultChan()
+		if event.Type != watch.Added || event.Object == nil {
+			t.Fatalf("expected first value to be set to ADDED, got %#v", event)
+		}
+
+		// version should match what we set
+		pod := event.Object.(*api.Pod)
+		if pod.ResourceVersion != expectedVersion {
+			t.Errorf("expected version %d, got %#v", expectedVersion, pod)
+		}
+
+		// should be no events in the stream
+		select {
+		case event, ok := <-w.ResultChan():
+			if !ok {
+				t.Fatalf("channel closed unexpectedly")
+			}
+			t.Fatalf("unexpected object in channel: %#v", event)
+		default:
+		}
+
+		// should return the previously deleted item in the watch, but with the latest index
+		resp, err = client.Delete(key, false)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		expectedVersion = resp.Node.ModifiedIndex
+		event = <-w.ResultChan()
+		if event.Type != watch.Deleted {
+			t.Fatalf("expected deleted event", event)
+		}
+		pod = event.Object.(*api.Pod)
+		if pod.ResourceVersion != expectedVersion {
+			t.Errorf("expected version %d, got %#v", expectedVersion, pod)
+		}
+	})
+}

test/integration/utils.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+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.
+*/
+
+// +build integration
+
+package integration
+
+import (
+	"fmt"
+	"math/rand"
+
+	"github.com/coreos/go-etcd/etcd"
+	"github.com/golang/glog"
+)
+
+func newEtcdClient() *etcd.Client {
+	return etcd.NewClient([]string{})
+}
+
+func requireEtcd() {
+	if _, err := newEtcdClient().Get("/", false, false); err != nil {
+		glog.Fatalf("unable to connect to etcd for integration testing: %v", err)
+	}
+}
+
+func withEtcdKey(f func(string)) {
+	prefix := fmt.Sprintf("/test-%d", rand.Int63())
+	defer newEtcdClient().Delete(prefix, true)
+	f(prefix)
+}