Skip to content

Commit 09bd3cf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #261 from timoreimann/cleanup-consistently
Centralize cleanup of created resources
2 parents 4b9faee + 357a804 commit 09bd3cf

40 files changed

+660
-979
lines changed

‎cmd/csi-sanity/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
25+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
2626
)
2727

2828
const (

‎cmd/mock-driver/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"syscall"
2727

28-
"github.com/kubernetes-csi/csi-test/v3/driver"
29-
"github.com/kubernetes-csi/csi-test/v3/mock/service"
28+
"github.com/kubernetes-csi/csi-test/v4/driver"
29+
"github.com/kubernetes-csi/csi-test/v4/mock/service"
3030
"gopkg.in/yaml.v2"
3131
)
3232

‎driver/mock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package driver
1919
import (
2020
"net"
2121

22-
"github.com/kubernetes-csi/csi-test/v3/utils"
22+
"github.com/kubernetes-csi/csi-test/v4/utils"
2323
"google.golang.org/grpc"
2424
)
2525

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-csi/csi-test/v3
1+
module github.com/kubernetes-csi/csi-test/v4
22

33
go 1.12
44

‎go.sum

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
2323
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2424
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
2525
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
26+
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
2627
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
2728
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
2829
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -60,6 +61,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
6061
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6162
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6263
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
64+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
6365
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6466
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 h1:dHtDnRWQtSx0Hjq9kvKFpBh9uPPKfQN70NZZmvssGwk=
6567
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -76,6 +78,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
7678
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
7779
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
7880
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
81+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
7982
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
8083
google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de h1:dFEMUWudT9iV1JMk6i6NwbfIw2V/2VDFyDYCZFypRxE=
8184
google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=

‎hack/_apitest/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package apitest
33
import (
44
"testing"
55

6-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
6+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
77
)
88

99
func TestMyDriver(t *testing.T) {

‎hack/_apitest2/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path"
77
"testing"
88

9-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
9+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
1010
)
1111

1212
// TestMyDriverWithCustomTargetPaths verifies that CreateTargetDir and

‎hack/_embedded/embedded_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package embedded
33
import (
44
"testing"
55

6-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
6+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
77
. "github.com/onsi/ginkgo"
88
. "github.com/onsi/gomega"
99
)

‎mock/service/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync/atomic"
1010

1111
"github.com/container-storage-interface/spec/lib/go/csi"
12-
"github.com/kubernetes-csi/csi-test/v3/mock/cache"
12+
"github.com/kubernetes-csi/csi-test/v4/mock/cache"
1313
"golang.org/x/net/context"
1414
"google.golang.org/grpc/codes"
1515

‎pkg/sanity/cleanup.go

-145
This file was deleted.

0 commit comments

Comments
 (0)