Skip to content

Commit

Permalink
Update csi-test to digitalocean/csi-test@master
Browse files Browse the repository at this point in the history
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
  • Loading branch information
timoreimann committed Apr 23, 2020
1 parent a972bc5 commit f0d2372
Show file tree
Hide file tree
Showing 337 changed files with 28,506 additions and 3,455 deletions.
9 changes: 3 additions & 6 deletions driver/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"time"

"github.com/digitalocean/godo"
"github.com/kubernetes-csi/csi-test/pkg/sanity"
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
)
Expand Down Expand Up @@ -94,11 +94,8 @@ func TestDriverSuite(t *testing.T) {
return driver.Run(ctx)
})

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

cancel()
Expand Down
12 changes: 7 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ require (
github.com/digitalocean/godo v1.29.0
github.com/docker/docker v1.13.1
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
github.com/golang/protobuf v1.3.1
github.com/golang/protobuf v1.3.2
github.com/google/go-cmp v0.3.0
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
github.com/kubernetes-csi/csi-test/v3 v3.1.1-0.20200422103951-b91f2543e6e7
github.com/kubernetes-csi/external-snapshotter v0.4.1
github.com/magiconair/properties v1.8.1
github.com/sirupsen/logrus v1.2.0
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
google.golang.org/grpc v1.23.0
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
google.golang.org/grpc v1.25.1
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
Expand Down Expand Up @@ -56,3 +56,5 @@ replace (
)

go 1.14

replace github.com/kubernetes-csi/csi-test/v3 => github.com/digitalocean/csi-test/v3 v3.1.1-0.20200422215505-20e87c55f1f6
34 changes: 32 additions & 2 deletions go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions vendor/github.com/golang/protobuf/proto/properties.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f0d2372

Please sign in to comment.