Skip to content

Commit f0d2372

Browse files
author
Timo Reimann
committed
Update csi-test to digitalocean/csi-test@master
This change updates csi-test to digitalocean/csi-test@master. We use our own fork which sits on top of upstream master and comes with the following customizations: - The 'should fail when the volume is missing' test is disabled because it does not work for us right now. See [1] for details and our effort to improve upstream. - It adds yet unreleased tests for our change in [2] (specifically, [3]). Going forward, we plan to return to using the upstream, released test package. [1]: kubernetes-csi/csi-test#258 [2]: #299 [3]: kubernetes-csi/csi-test@b91f254
1 parent a972bc5 commit f0d2372

File tree

337 files changed

+28506
-3455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+28506
-3455
lines changed

driver/driver_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"time"
3030

3131
"github.com/digitalocean/godo"
32-
"github.com/kubernetes-csi/csi-test/pkg/sanity"
32+
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
3333
"github.com/sirupsen/logrus"
3434
"golang.org/x/sync/errgroup"
3535
)
@@ -94,11 +94,8 @@ func TestDriverSuite(t *testing.T) {
9494
return driver.Run(ctx)
9595
})
9696

97-
cfg := &sanity.Config{
98-
TargetPath: os.TempDir() + "/csi-target",
99-
StagingPath: os.TempDir() + "/csi-staging",
100-
Address: endpoint,
101-
}
97+
cfg := sanity.NewTestConfig()
98+
cfg.Address = endpoint
10299
sanity.Test(t, cfg)
103100

104101
cancel()

go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ require (
77
github.com/digitalocean/godo v1.29.0
88
github.com/docker/docker v1.13.1
99
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
10-
github.com/golang/protobuf v1.3.1
10+
github.com/golang/protobuf v1.3.2
1111
github.com/google/go-cmp v0.3.0
1212
github.com/googleapis/gnostic v0.2.0 // indirect
1313
github.com/imdario/mergo v0.3.6 // indirect
14-
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
14+
github.com/kubernetes-csi/csi-test/v3 v3.1.1-0.20200422103951-b91f2543e6e7
1515
github.com/kubernetes-csi/external-snapshotter v0.4.1
1616
github.com/magiconair/properties v1.8.1
17-
github.com/sirupsen/logrus v1.2.0
17+
github.com/sirupsen/logrus v1.4.2
1818
github.com/stretchr/testify v1.4.0 // indirect
1919
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
2020
golang.org/x/sync v0.0.0-20190423024810-112230192c58
21-
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
22-
google.golang.org/grpc v1.23.0
21+
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
22+
google.golang.org/grpc v1.25.1
2323
gopkg.in/inf.v0 v0.9.1 // indirect
2424
k8s.io/api v0.0.0
2525
k8s.io/apimachinery v0.0.0
@@ -56,3 +56,5 @@ replace (
5656
)
5757

5858
go 1.14
59+
60+
replace github.com/kubernetes-csi/csi-test/v3 => github.com/digitalocean/csi-test/v3 v3.1.1-0.20200422215505-20e87c55f1f6

go.sum

Lines changed: 32 additions & 2 deletions
Large diffs are not rendered by default.

vendor/github.com/golang/protobuf/proto/properties.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/konsorten/go-windows-terminal-sequences/README.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/README.md renamed to vendor/github.com/kubernetes-csi/csi-test/v3/pkg/sanity/README.md

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/cleanup.go renamed to vendor/github.com/kubernetes-csi/csi-test/v3/pkg/sanity/cleanup.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)