Skip to content

Commit

Permalink
Change import paths to the imported integration test framework
Browse files Browse the repository at this point in the history 
```
git grep -l sigs.k8s.io/testing_frameworks -- '*.go' \
  | xargs sed -i'' 's@sigs.k8s.io/testing_frameworks@sigs.k8s.io/controller-runtime/pkg/internal/testing@g'
```
  • Loading branch information
@hoegaarden
hoegaarden committed Dec 6, 2019
1 parent ffbd93d commit 56c5ea7
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pkg/builder/builder_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/metrics"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/testing_frameworks/integration/addr"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
)

func TestBuilder(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/envtest/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/testing_frameworks/integration"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"

logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/addr/manager_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package addr_test

import (
"sigs.k8s.io/testing_frameworks/integration/addr"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"

"net"
"strconv"
Expand Down
4 changes: 2 additions & 2 deletions pkg/internal/testing/integration/apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/url"
"time"

"sigs.k8s.io/testing_frameworks/integration/addr"
"sigs.k8s.io/testing_frameworks/integration/internal"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

// APIServer knows how to run a kubernetes apiserver.
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/etcd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"net/url"

"sigs.k8s.io/testing_frameworks/integration/internal"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

// Etcd knows how to run an etcd server.
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/apiserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal_test
import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "sigs.k8s.io/testing_frameworks/integration/internal"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

var _ = Describe("Apiserver", func() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/internal/testing/integration/internal/arguments_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"sigs.k8s.io/testing_frameworks/integration"
. "sigs.k8s.io/testing_frameworks/integration/internal"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

var _ = Describe("Arguments", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/etcd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal_test
import (
"net/url"

. "sigs.k8s.io/testing_frameworks/integration/internal"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/integration_tests/apiserver_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "sigs.k8s.io/testing_frameworks/integration"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"
)

var _ = Describe("APIServer", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/integration_tests/etcd_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "sigs.k8s.io/testing_frameworks/integration"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"
)

var _ = Describe("Etcd", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/integration_tests/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"sigs.k8s.io/testing_frameworks/integration"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"
)

var _ = Describe("The Testing Framework", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/internal/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/onsi/gomega/gbytes"
"github.com/onsi/gomega/gexec"

"sigs.k8s.io/testing_frameworks/integration/addr"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
)

type ProcessState struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/internal/testing/integration/internal/process_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
"github.com/onsi/gomega/ghttp"
"sigs.k8s.io/testing_frameworks/integration/addr"
. "sigs.k8s.io/testing_frameworks/integration/internal"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

var _ = Describe("Start method", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/kubectl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"os/exec"

"sigs.k8s.io/testing_frameworks/integration/internal"
"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
)

// KubeCtl is a wrapper around the kubectl binary.
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/testing/integration/kubectl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "sigs.k8s.io/testing_frameworks/integration"
. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration"
)

var _ = Describe("Kubectl", func() {
Expand Down

0 comments on commit 56c5ea7

Please sign in to comment.