From 6ac2f53dceb473a0c40e00b53181b1282ea4b4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 22 Feb 2022 20:40:41 +0000 Subject: [PATCH] update integration tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- pkg/storage/utils/decomposedfs/decomposedfs.go | 3 --- pkg/storage/utils/decomposedfs/options/options.go | 1 - .../grpc/fixtures/storageprovider-ocis.toml | 4 +--- .../integration/grpc/gateway_storageprovider_test.go | 5 ++--- tests/integration/grpc/grpc_suite_test.go | 2 +- tests/integration/grpc/storageprovider_test.go | 11 ++++++----- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go index 2eb00f4d094..5116b62d44f 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs.go @@ -43,7 +43,6 @@ import ( "github.com/cs3org/reva/pkg/errtypes" "github.com/cs3org/reva/pkg/logger" "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" "github.com/cs3org/reva/pkg/storage" "github.com/cs3org/reva/pkg/storage/utils/chunking" "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" @@ -115,8 +114,6 @@ func NewDefault(m map[string]interface{}, bs tree.Blobstore) (storage.FS, error) tp := tree.New(o.Root, o.TreeTimeAccounting, o.TreeSizeAccounting, lu, bs) - o.GatewayAddr = sharedconf.GetGatewaySVC(o.GatewayAddr) - permissionsClient, err := pool.GetPermissionsClient(o.PermissionsSVC) if err != nil { return nil, err diff --git a/pkg/storage/utils/decomposedfs/options/options.go b/pkg/storage/utils/decomposedfs/options/options.go index a17d092d0b4..21d11f36204 100644 --- a/pkg/storage/utils/decomposedfs/options/options.go +++ b/pkg/storage/utils/decomposedfs/options/options.go @@ -51,7 +51,6 @@ type Options struct { OwnerIDP string `mapstructure:"owner_idp"` OwnerType string `mapstructure:"owner_type"` - GatewayAddr string `mapstructure:"gateway_addr"` PermissionsSVC string `mapstructure:"permissionssvc"` } diff --git a/tests/integration/grpc/fixtures/storageprovider-ocis.toml b/tests/integration/grpc/fixtures/storageprovider-ocis.toml index 32e2f780449..b9012140d24 100644 --- a/tests/integration/grpc/fixtures/storageprovider-ocis.toml +++ b/tests/integration/grpc/fixtures/storageprovider-ocis.toml @@ -9,6 +9,4 @@ root = "{{root}}/storage" treetime_accounting = true treesize_accounting = true enable_home = true -userprovidersvc = "localhost:18000" -gateway_addr = "{{gateway_address}}" -permissionssvc = "{{permissions_address}}" \ No newline at end of file +permissionssvc = "{{permissions_address}}" diff --git a/tests/integration/grpc/gateway_storageprovider_test.go b/tests/integration/grpc/gateway_storageprovider_test.go index 42fc8d06743..7883923142a 100644 --- a/tests/integration/grpc/gateway_storageprovider_test.go +++ b/tests/integration/grpc/gateway_storageprovider_test.go @@ -371,9 +371,8 @@ var _ = Describe("gateway", func() { JustBeforeEach(func() { var err error fs, err = ocis.New(map[string]interface{}{ - "root": revads["storage"].StorageRoot, - "userprovidersvc": revads["users"].GrpcAddress, - "gateway_addr": revads["gateway"].GrpcAddress, + "root": revads["storage"].StorageRoot, + //"userprovidersvc": revads["users"].GrpcAddress, "permissionssvc": revads["permissions"].GrpcAddress, "enable_home": true, "treesize_accounting": true, diff --git a/tests/integration/grpc/grpc_suite_test.go b/tests/integration/grpc/grpc_suite_test.go index 0bbb451cc0a..b9bbc7fe9a6 100644 --- a/tests/integration/grpc/grpc_suite_test.go +++ b/tests/integration/grpc/grpc_suite_test.go @@ -152,7 +152,7 @@ func startRevads(configs map[string]string, variables map[string]string) (map[st } // even the port is open the service might not be available yet - time.Sleep(1 * time.Second) + time.Sleep(2 * time.Second) revad := &Revad{ TmpRoot: tmpRoot, diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index 03d3c06abc3..1d4091a7d43 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -131,19 +131,19 @@ var _ = Describe("storage providers", func() { assertCreateHome := func(provider string) { It("creates a home directory", func() { homeRef := ref(provider, homePath) - _, err := serviceClient.Stat(ctx, &storagep.StatRequest{Ref: homeRef}) + statRes, err := serviceClient.Stat(ctx, &storagep.StatRequest{Ref: homeRef}) Expect(err).ToNot(HaveOccurred()) - // Expect(statRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_NOT_FOUND)) + Expect(statRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_NOT_FOUND)) res, err := serviceClient.CreateStorageSpace(ctx, &storagep.CreateStorageSpaceRequest{ Owner: user, Type: "personal", Name: user.Id.OpaqueId, }) - Expect(res.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) Expect(err).ToNot(HaveOccurred()) + Expect(res.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) - statRes, err := serviceClient.Stat(ctx, &storagep.StatRequest{Ref: ref(provider, homePath)}) + statRes, err = serviceClient.Stat(ctx, &storagep.StatRequest{Ref: ref(provider, homePath)}) Expect(err).ToNot(HaveOccurred()) Expect(statRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) @@ -730,7 +730,8 @@ var _ = Describe("storage providers", func() { }) suite("ocis", map[string]string{ - "storage": "storageprovider-ocis.toml", + "storage": "storageprovider-ocis.toml", + "permissions": "permissions-ocis-ci.toml", }) })