Embed etcd in the integration tests directly. (#1570)

* Updating etcd.

* Adding deps for etcd.

* Revert delete of comments.

* Fix paste,

* Move etcd port for current integration tests.

* Move etcd port for current integration tests.

* Use embed ectd for intergration tests.

* Always use a open port for integration ectd service.

* Remove the test that starts ectd with MainTest also starting etcd.

* Now time to panic.

Author: n3wscott

glide.lock

@@ -94,3 +94,5 @@ import:
   version: 215affda49addc4c8ef7e2534915df2c8c35c6cd
 - package: github.com/pmorie/go-open-service-broker-client
   version: 31d8027f493f8f23f850415d171c7c52a972a6f2
+- package: github.com/coreos/etcd
+  version: ^3.2.9

glide.yaml

@@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 GOROOT=$(go env GOROOT)
 
 runTests() {
-  kube::etcd::start
+  # kube::etcd::start
 
   if [[ -w ${GOROOT}/pkg ]]; then
     FLAGS="-i"
@@ -39,7 +39,7 @@ runTests() {
 }
 
 # Run cleanup to stop etcd on interrupt or other kill signal.
-trap kube::etcd::cleanup EXIT
+# trap kube::etcd::cleanup EXIT
 
 runTests $@
 

test/integration.sh

@@ -0,0 +1,76 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+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 (
+	"fmt"
+	"github.com/coreos/etcd/embed"
+	"github.com/golang/glog"
+	"io/ioutil"
+	"os"
+	"testing"
+	"time"
+)
+
+type EtcdContext struct {
+	etcd     *embed.Etcd
+	dir      string
+	Endpoint string
+}
+
+var etcdContext = EtcdContext{}
+
+func startEtcd() error {
+	var err error
+	if etcdContext.dir, err = ioutil.TempDir(os.TempDir(), "service_catalog_integration_test"); err != nil {
+		return fmt.Errorf("could not create TempDir: %v", err)
+	}
+	cfg := embed.NewConfig()
+	cfg.Dir = etcdContext.dir
+
+	if etcdContext.etcd, err = embed.StartEtcd(cfg); err != nil {
+		return fmt.Errorf("Failed starting etcd: %+v", err)
+	}
+
+	select {
+	case <-etcdContext.etcd.Server.ReadyNotify():
+		glog.Info("server is ready!")
+	case <-time.After(60 * time.Second):
+		etcdContext.etcd.Server.Stop() // trigger a shutdown
+		glog.Error("server took too long to start!")
+	}
+	return nil
+}
+
+func stopEtcd() {
+	etcdContext.etcd.Server.Stop()
+	os.RemoveAll(etcdContext.dir)
+}
+
+func TestMain(m *testing.M) {
+	// Setup
+	if err := startEtcd(); err != nil {
+		panic(fmt.Sprintf("Failed to start etcd, %v", err))
+	}
+
+	// Tests
+	result := m.Run()
+
+	// Teardown
+	stopEtcd()
+	os.Exit(result)
+}