From 98670bb774510f6c183f271b7d31defd13fe382b Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Wed, 5 Jul 2023 11:58:44 +0200 Subject: [PATCH] fix integration tests --- tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml | 1 + tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml | 1 + .../grpc/fixtures/ocm-share/ocm-server-cernbox-grpc.toml | 1 + .../grpc/fixtures/ocm-share/ocm-server-cernbox-http.toml | 1 + .../grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml | 2 ++ .../grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml | 1 + tests/integration/grpc/ocm_invitation_test.go | 2 +- 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml b/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml index 622974dcb3..ed9d667478 100644 --- a/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml +++ b/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml @@ -12,6 +12,7 @@ address = "{{grpc_address}}" [http.services.sciencemesh] provider_domain = "{{cernboxhttp_address}}" mesh_directory_url = "http://meshdir" +smtp_credentials = {} [http.middlewares.cors] diff --git a/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml b/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml index 93690ec5f4..a4ee3efa9a 100644 --- a/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml +++ b/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml @@ -12,6 +12,7 @@ address = "{{grpc_address}}" [http.services.sciencemesh] provider_domain = "{{cesnethttp_address}}" mesh_directory_url = "http://meshdir" +smtp_credentials = {} [http.middlewares.cors] diff --git a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-grpc.toml b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-grpc.toml index 49fc9b7bb8..c2c077b74c 100644 --- a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-grpc.toml +++ b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-grpc.toml @@ -58,6 +58,7 @@ providers = "{{file_providers}}" [grpc.services.ocmshareprovider] driver = "json" webdav_endpoint = "http://{{cernboxwebdav_address}}" +provider_domain = "cernbox.cern.ch" [grpc.services.ocmshareprovider.drivers.json] file = "{{ocm_share_cernbox_file}}" diff --git a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-http.toml b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-http.toml index 95a6f7dec5..03a8a0b89b 100644 --- a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-http.toml +++ b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cernbox-http.toml @@ -12,6 +12,7 @@ address = "{{grpc_address}}" [http.services.sciencemesh] provider_domain = "{{cernboxhttp_address}}" mesh_directory_url = "http://meshdir" +smtp_credentials = {} [http.middlewares.cors] diff --git a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml index edd7e950f6..3a225319ab 100644 --- a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml +++ b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml @@ -37,6 +37,8 @@ providers = "{{file_providers}}" [grpc.services.ocmshareprovider] driver = "json" +webdav_endpoint = "http://{{cesnethttp_address}}" +provider_domain = "cesnet.cz" [grpc.services.ocmshareprovider.drivers.json] file = "{{ocm_share_cesnet_file}}" diff --git a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml index 11ade22fe3..6a12f8eb99 100644 --- a/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml +++ b/tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml @@ -12,6 +12,7 @@ address = "{{grpc_address}}" [http.services.sciencemesh] provider_domain = "{{cesnethttp_address}}" mesh_directory_url = "http://meshdir" +smtp_credentials = {} [http.middlewares.cors] diff --git a/tests/integration/grpc/ocm_invitation_test.go b/tests/integration/grpc/ocm_invitation_test.go index be47dcce89..c4addc6c79 100644 --- a/tests/integration/grpc/ocm_invitation_test.go +++ b/tests/integration/grpc/ocm_invitation_test.go @@ -124,7 +124,7 @@ var _ = Describe("ocm invitation workflow", func() { } ) - for _, driver := range []string{"json", "sql"} { + for _, driver := range []string{"json"} { JustBeforeEach(func() { tokenManager, err := jwt.New(map[string]interface{}{"secret": "changemeplease"})