tests/functional: Mechanical rename of imports etcd/v3/functional/ -> etcd/tests/v3/functional/...
% find ./ -name "*.go" | xargs sed -i "s|go.etcd.io/etcd/v3/functional/agent|go.etcd.io/etcd/tests/v3/functional/agent|g" % find ./ -name "*.go" | xargs sed -i "s|go.etcd.io/etcd/v3/functional/runner|go.etcd.io/etcd/tests/v3/functional/runner|g" % find ./ -name "*.go" | xargs sed -i "s|go.etcd.io/etcd/v3/functional/tester|go.etcd.io/etcd/tests/v3/functional/tester|g" % find ./ -name "*.go" | xargs sed -i "s|go.etcd.io/etcd/v3/functional/rpcpb|go.etcd.io/etcd/tests/v3/functional/rpcpb|g"release-3.5
parent
69254d8cf8
commit
8907b146d4
|
@ -25,7 +25,7 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/pkg/fileutil"
|
"go.etcd.io/etcd/v3/pkg/fileutil"
|
||||||
"go.etcd.io/etcd/v3/pkg/proxy"
|
"go.etcd.io/etcd/v3/pkg/proxy"
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/embed"
|
"go.etcd.io/etcd/v3/embed"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
"go.etcd.io/etcd/v3/pkg/proxy"
|
"go.etcd.io/etcd/v3/pkg/proxy"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -18,7 +18,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/agent"
|
"go.etcd.io/etcd/tests/v3/functional/agent"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
// against a fault injected cluster.
|
// against a fault injected cluster.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/runner"
|
import "go.etcd.io/etcd/tests/v3/functional/runner"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
runner.Start()
|
runner.Start()
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"flag"
|
"flag"
|
||||||
|
|
||||||
_ "github.com/etcd-io/gofail/runtime"
|
_ "github.com/etcd-io/gofail/runtime"
|
||||||
"go.etcd.io/etcd/v3/functional/tester"
|
"go.etcd.io/etcd/tests/v3/functional/tester"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type caseExternal struct {
|
type caseExternal struct {
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
type failpointStats struct {
|
type failpointStats struct {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/rpcpb"
|
import "go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error {
|
func inject_BLACKHOLE_PEER_PORT_TX_RX(clus *Cluster, idx int) error {
|
||||||
return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX)
|
return clus.sendOp(idx, rpcpb.Operation_BLACKHOLE_PEER_PORT_TX_RX)
|
||||||
|
|
|
@ -17,7 +17,7 @@ package tester
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,7 +17,7 @@ package tester
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,8 +21,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/clientv3"
|
"go.etcd.io/etcd/v3/clientv3"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/clientv3"
|
"go.etcd.io/etcd/v3/clientv3"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/rpcpb"
|
import "go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
func inject_SIGTERM_ETCD(clus *Cluster, idx int) error {
|
func inject_SIGTERM_ETCD(clus *Cluster, idx int) error {
|
||||||
return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD)
|
return clus.sendOp(idx, rpcpb.Operation_SIGTERM_ETCD)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/rpcpb"
|
import "go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
// Checker checks cluster consistency.
|
// Checker checks cluster consistency.
|
||||||
type Checker interface {
|
type Checker interface {
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/clientv3"
|
"go.etcd.io/etcd/v3/clientv3"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/rpcpb"
|
import "go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
type noCheck struct{}
|
type noCheck struct{}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package tester
|
package tester
|
||||||
|
|
||||||
import "go.etcd.io/etcd/v3/functional/rpcpb"
|
import "go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
type runnerChecker struct {
|
type runnerChecker struct {
|
||||||
ctype rpcpb.Checker
|
ctype rpcpb.Checker
|
||||||
|
|
|
@ -29,7 +29,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/pkg/debugutil"
|
"go.etcd.io/etcd/v3/pkg/debugutil"
|
||||||
"go.etcd.io/etcd/v3/pkg/fileutil"
|
"go.etcd.io/etcd/v3/pkg/fileutil"
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
yaml "gopkg.in/yaml.v2"
|
yaml "gopkg.in/yaml.v2"
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/pkg/fileutil"
|
"go.etcd.io/etcd/v3/pkg/fileutil"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
@ -262,7 +262,7 @@ func Test_read(t *testing.T) {
|
||||||
}
|
}
|
||||||
defer logger.Sync()
|
defer logger.Sync()
|
||||||
|
|
||||||
cfg, err := read(logger, "../../functional.yaml")
|
cfg, err := read(logger, "../functional.yaml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,9 +24,9 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/clientv3"
|
"go.etcd.io/etcd/v3/clientv3"
|
||||||
"go.etcd.io/etcd/v3/etcdserver"
|
"go.etcd.io/etcd/v3/etcdserver"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
"go.etcd.io/etcd/v3/raft"
|
"go.etcd.io/etcd/v3/raft"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
|
@ -23,8 +23,8 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
|
||||||
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
"go.etcd.io/etcd/v3/clientv3"
|
"go.etcd.io/etcd/v3/clientv3"
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/functional/rpcpb"
|
"go.etcd.io/etcd/tests/v3/functional/rpcpb"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
|
|
14
tests/go.mod
14
tests/go.mod
|
@ -4,8 +4,22 @@ go 1.15
|
||||||
|
|
||||||
replace go.etcd.io/etcd/v3 => ../
|
replace go.etcd.io/etcd/v3 => ../
|
||||||
|
|
||||||
|
replace go.etcd.io/etcd/api/v3 => ../api
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
|
||||||
|
github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca
|
||||||
|
github.com/gogo/protobuf v1.2.1
|
||||||
|
github.com/golang/protobuf v1.3.2
|
||||||
github.com/grpc-ecosystem/grpc-gateway v1.9.5
|
github.com/grpc-ecosystem/grpc-gateway v1.9.5
|
||||||
|
github.com/prometheus/client_golang v1.0.0
|
||||||
|
github.com/spf13/cobra v0.0.3
|
||||||
|
github.com/spf13/pflag v1.0.1
|
||||||
go.etcd.io/bbolt v1.3.5
|
go.etcd.io/bbolt v1.3.5
|
||||||
|
go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000
|
||||||
go.etcd.io/etcd/v3 v3.0.0-00010101000000-000000000000
|
go.etcd.io/etcd/v3 v3.0.0-00010101000000-000000000000
|
||||||
|
go.uber.org/zap v1.15.0
|
||||||
|
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
|
||||||
|
google.golang.org/grpc v1.26.0
|
||||||
|
gopkg.in/yaml.v2 v2.2.2
|
||||||
)
|
)
|
||||||
|
|
|
@ -26,6 +26,7 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05w
|
||||||
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||||
|
github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca h1:Y2I0lxOttdUKz+hNaIdG3FtjuQrTmwXun1opRV65IZc=
|
||||||
github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE=
|
github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE=
|
||||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||||
|
@ -115,6 +116,7 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||||
github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
|
github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
|
||||||
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
||||||
|
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
|
||||||
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||||
github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4=
|
github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4=
|
||||||
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||||
|
|
Loading…
Reference in New Issue