From bcee7c39cef87c583373b59270351732cbd81f1e Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Fri, 18 Aug 2017 10:58:05 -0700
Subject: [PATCH] e2e: test v2v3 emulation

---
 e2e/cluster_test.go |  1 +
 e2e/v2_test.go      | 19 +++++++++++++++++++
 e2e/v2v3_test.go    | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 e2e/v2_test.go
 create mode 100644 e2e/v2v3_test.go

diff --git a/e2e/cluster_test.go b/e2e/cluster_test.go
index 991fb13dce95..0ea7bd24bb94 100644
--- a/e2e/cluster_test.go
+++ b/e2e/cluster_test.go
@@ -212,6 +212,7 @@ func (cfg *etcdProcessClusterConfig) etcdServerProcessConfigs() []*etcdServerPro
 			"--data-dir", dataDirPath,
 			"--snapshot-count", fmt.Sprintf("%d", cfg.snapCount),
 		}
+		args = addV2Args(args)
 		if cfg.forceNewCluster {
 			args = append(args, "--force-new-cluster")
 		}
diff --git a/e2e/v2_test.go b/e2e/v2_test.go
new file mode 100644
index 000000000000..ad59211ecff1
--- /dev/null
+++ b/e2e/v2_test.go
@@ -0,0 +1,19 @@
+// 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.
+
+// +build !v2v3
+
+package e2e
+
+func addV2Args(args []string) []string { return args }
diff --git a/e2e/v2v3_test.go b/e2e/v2v3_test.go
new file mode 100644
index 000000000000..b9c69466a450
--- /dev/null
+++ b/e2e/v2v3_test.go
@@ -0,0 +1,21 @@
+// 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.
+
+// +build v2v3
+
+package e2e
+
+func addV2Args(args []string) []string {
+	return append(args, "--experimental-enable-v2v3", "v2/")
+}