Integrate verification into e2e tests.

tests/e2e/ctl_v2_test.go

@@ -20,17 +20,14 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"go.etcd.io/etcd/client/pkg/v3/testutil"
 )
 
 func BeforeTestV2(t testing.TB) {
-	skipInShortMode(t)
+	BeforeTest(t)
 	os.Setenv("ETCDCTL_API", "2")
 	t.Cleanup(func() {
 		os.Unsetenv("ETCDCTL_API")
 	})
-	testutil.BeforeTest(t)
 }
 
 func TestCtlV2Set(t *testing.T)          { testCtlV2Set(t, newConfigNoTLS(), false) }
@@ -493,7 +490,11 @@ func etcdctlBackup(t testing.TB, clus *etcdProcessCluster, dataDir, backupDir st
 	if err != nil {
 		return err
 	}
-	return proc.Close()
+	err = proc.Close()
+	if err != nil {
+		return err
+	}
+	return proc.ProcessError()
 }
 
 func setupEtcdctlTest(t *testing.T, cfg *etcdProcessClusterConfig, quorum bool) *etcdProcessCluster {

tests/e2e/ctl_v3_migrate_test.go

@@ -23,10 +23,13 @@ import (
 
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
 	"go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/server/v3/verify"
 )
 
 func BeforeTest(t testing.TB) {
+	skipInShortMode(t)
 	testutil.BeforeTest(t)
+	os.Setenv(verify.ENV_VERIFY, verify.ENV_VERIFY_ALL_VALUE)
 }
 
 func TestCtlV3Migrate(t *testing.T) {