diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index c3713b263a..5d4461c25f 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -289,7 +289,7 @@ clean-files: clean: clean-docker-container clean-docker-volumes clean-dev-docker-image clean-files ## clean all .PHONY: start-server -start-server: ## build and start server +start-server: $(OC_WRAPPER) ## build and start server @echo "Build and start server..." COMPOSE_FILE=$(COMPOSE_FILE) \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ diff --git a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md index 0919abd5b9..cf2b6d229d 100644 --- a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md @@ -195,11 +195,11 @@ #### [Skip tests for different languages](https://github.com/opencloud-eu/opencloud/issues/183) - [apiAntivirus/antivirus.feature:309](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L309) - [apiAntivirus/antivirus.feature:310](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L310) -- [apiAntivirus/antivirus.feature:311](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L310) +- [apiAntivirus/antivirus.feature:311](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L311) - [apiNotification/deprovisioningNotification.feature:127](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/deprovisioningNotification.feature#L127) - [apiNotification/notification.feature:284](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/notification.feature#L284) - [apiNotification/notification.feature:285](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/notification.feature#L285) -- [apiNotification/spaceNotification.feature:435](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/spaceNotification.feature#435) +- [apiNotification/spaceNotification.feature:435](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/spaceNotification.feature#L435) #### [Missing properties in REPORT response](https://github.com/owncloud/ocis/issues/9780), [d:getetag property has empty value in REPORT response](https://github.com/owncloud/ocis/issues/9783) diff --git a/tests/acceptance/run_api_tests.sh b/tests/acceptance/run_api_tests.sh index 96354d08d7..d3cfe52d60 100755 --- a/tests/acceptance/run_api_tests.sh +++ b/tests/acceptance/run_api_tests.sh @@ -3,6 +3,7 @@ # Set required environment variables export LOCAL_TEST=true export START_EMAIL=true +export WITH_WRAPPER=true # LOCAL TEST WITHOUT EXTRA ENVS TEST_SERVER_URL="https://opencloud-server:9200" diff --git a/tests/ocwrapper/Makefile b/tests/ocwrapper/Makefile index 45d24650b5..6c6f9fb292 100644 --- a/tests/ocwrapper/Makefile +++ b/tests/ocwrapper/Makefile @@ -3,6 +3,7 @@ GOARCH := $(shell go env GOARCH) .PHONY: build build: + GOWORK=off \ GOOS=$(GOOS) \ GOARCH=$(GOARCH) \ go build -o bin/ocwrapper diff --git a/tests/ocwrapper/go.mod b/tests/ocwrapper/go.mod index 7a4a66d0b7..a135f45bdc 100644 --- a/tests/ocwrapper/go.mod +++ b/tests/ocwrapper/go.mod @@ -3,8 +3,11 @@ module ocwrapper go 1.20 require ( - github.com/creack/pty v1.1.21 // indirect + github.com/creack/pty v1.1.21 + github.com/spf13/cobra v1.7.0 +) + +require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect )