mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-29 03:33:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from opencloud-eu/run_tests_in_docker_fix

Browse Source 
run tests in docker fix
This commit is contained in:
Viktor Scharf
2025-01-22 16:31:12 +01:00
committed by GitHub
parent 17a31c7bbc 4b1f49e169
commit 75f9664dda
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/acceptance/docker/Makefile
View File

@@ -190,22 +190,22 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
@if [ -n "${START_CEPH}" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/ceph.yml \
docker-compose run start_ceph; \
docker compose run start_ceph; \
fi; \
if [ "${START_EMAIL}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/email.yml \
docker-compose run start_email; \
docker compose run start_email; \
fi; \
if [ "${START_ANTIVIRUS}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/antivirus.yml \
docker-compose run start_antivirus; \
docker compose run start_antivirus; \
fi; \
if [ "${START_TIKA}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/tika.yml \
docker-compose run tika-service; \
docker compose run tika-service; \
fi; \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=$(COMPOSE_FILE) \
@@ -221,13 +221,13 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
BEHAT_FEATURE=$(BEHAT_FEATURE) \
DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \
RUN_PART=$(RUN_PART) \
docker-compose up -d --build --force-recreate
docker compose up -d --build --force-recreate
.PHONY: show-test-logs
show-test-logs: ## show logs of test
@COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=$(COMPOSE_FILE) \
docker-compose logs --no-log-prefix -f acceptance-tests | less
docker compose logs --no-log-prefix -f acceptance-tests | less
$(OC_WRAPPER):
@if [ "$(WITH_WRAPPER)" == "true" ]; then \
@@ -254,7 +254,7 @@ clean-docker-container: ## clean docker containers created during acceptance tes
RUN_PART="" \
STORAGE_DRIVER="" \
TEST_SOURCE="" \
docker-compose down --remove-orphans
docker compose down --remove-orphans
.PHONY: clean-docker-volumes
clean-docker-volumes: ## clean docker volumes created during acceptance tests
@@ -266,7 +266,7 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests
RUN_PART="" \
STORAGE_DRIVER="" \
TEST_SOURCE="" \
docker-compose down --remove-orphans -v
docker compose down --remove-orphans -v
.PHONY: clean-files
clean-files:

2
tests/acceptance/docker/src/serve-opencloud.sh
View File

@@ -7,5 +7,5 @@ opencloud init
if [ "$WITH_WRAPPER" = "true" ]; then
ocwrapper serve --bin=opencloud
else
oc server
opencloud server
fi

6
tests/acceptance/expected-failures-API-on-OCIS-storage.md
View File

@@ -16,7 +16,7 @@ _ocdav: double-check the webdav property parsing when custom namespaces are used
#### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914)
- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14)
- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14)
- [coreApiVersions/fileVersionAuthor.feature:60](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L60)
- [coreApiVersions/fileVersionAuthor.feature:92](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L92)
- [coreApiVersions/fileVersionAuthor.feature:123](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L123)
@@ -163,9 +163,9 @@ _ocdav: api compatibility, return correct status code_
- [coreApiWebdavMove1/moveFolder.feature:217](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L217)
- [coreApiWebdavMove1/moveFolder.feature:218](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L218)
- [coreApiWebdavMove1/moveFolder.feature:219](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L219)
- [coreApiWebdavMove2/moveShareOnOpencloud.feature:334](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L334)
- [coreApiWebdavMove2/moveShareOnOpencloud.feature:334](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L334)
- [coreApiWebdavMove2/moveShareOnOpenCloud.feature:337](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L337)
- [coreApiWebdavMove2/moveShareOnOpencloud.feature:340](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L340)
- [coreApiWebdavMove2/moveShareOnOpencloud.feature:340](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L340)
#### [COPY file/folder to same name is possible (but 500 code error for folder with spaces path)](https://github.com/owncloud/ocis/issues/8711)

7
tests/ocwrapper/Makefile
View File

@@ -1,3 +1,8 @@
GOOS := linux ## only linux is supported
GOARCH := $(shell go env GOARCH)
.PHONY: build
build:
go build -o bin/ocwrapper
GOOS=$(GOOS) \
GOARCH=$(GOARCH) \
go build -o bin/ocwrapper