Merge e2e spawn files.

Signed-off-by: James Blair <mail@jamesblair.net>

tests/framework/e2e/etcd_spawn.go

@@ -28,6 +28,26 @@ var (
 	additionalArgs func() ([]string, error)
 )
 
+const noOutputLineCount = 0 // regular binaries emit no extra lines
+
+func init() {
+	initBinPath = initBinPathNoCov
+	additionalArgs = additionalArgsNoCov
+}
+
+func initBinPathNoCov(binDir string) binPath {
+	return binPath{
+		Etcd:            binDir + "/etcd",
+		EtcdLastRelease: binDir + "/etcd-last-release",
+		Etcdctl:         binDir + "/etcdctl",
+		Etcdutl:         binDir + "/etcdutl",
+	}
+}
+
+func additionalArgsNoCov() ([]string, error) {
+	return []string{}, nil
+}
+
 func SpawnCmd(args []string, envVars map[string]string) (*expect.ExpectProcess, error) {
 	return SpawnNamedCmd(strings.Join(args, "_"), args, envVars)
 }

tests/framework/e2e/etcd_spawn_nocov.go

@@ -1,35 +0,0 @@
-// Copyright 2017 The etcd 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 e2e
-
-const noOutputLineCount = 0 // regular binaries emit no extra lines
-
-func init() {
-	initBinPath = initBinPathNoCov
-	additionalArgs = additionalArgsNoCov
-}
-
-func initBinPathNoCov(binDir string) binPath {
-	return binPath{
-		Etcd:            binDir + "/etcd",
-		EtcdLastRelease: binDir + "/etcd-last-release",
-		Etcdctl:         binDir + "/etcdctl",
-		Etcdutl:         binDir + "/etcdutl",
-	}
-}
-
-func additionalArgsNoCov() ([]string, error) {
-	return []string{}, nil
-}