diff --git a/.drone.star b/.drone.star index d66140622..abcf7d67d 100644 --- a/.drone.star +++ b/.drone.star @@ -812,7 +812,7 @@ def localApiTests(suite, storage, extra_environment = {}): "BEHAT_FILTER_TAGS": "~@skip&&~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS"), "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-localAPI-on-%s-storage.md" % (dirs["base"], storage.upper()), "UPLOAD_DELETE_WAIT_TIME": "1" if storage == "owncloud" else 0, - "OCIS_WRAPPER_URL": "http://ocis-server:5000", + "OCIS_WRAPPER_URL": "http://ocis-server:5200", } for item in extra_environment: diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md index 5fa8bdd27..e3495c2c0 100644 --- a/docs/ocis/development/testing.md +++ b/docs/ocis/development/testing.md @@ -245,7 +245,7 @@ PROXY_ENABLE_BASIC_AUTH=true \ ### Run the tests ```bash -OCIS_WRAPPER_URL=http://localhost:5000 \ +OCIS_WRAPPER_URL=http://localhost:5200 \ TEST_WITH_GRAPH_API=true \ TEST_OCIS=true \ TEST_SERVER_URL="https://localhost:9200" \ diff --git a/tests/TestHelpers/OcisConfigHelper.php b/tests/TestHelpers/OcisConfigHelper.php index 5f668d836..245934f58 100644 --- a/tests/TestHelpers/OcisConfigHelper.php +++ b/tests/TestHelpers/OcisConfigHelper.php @@ -60,7 +60,7 @@ class OcisConfigHelper { public static function getWrapperUrl(): string { $url = \getenv("OCIS_WRAPPER_URL"); if ($url === false) { - $url = "http://localhost:5000"; + $url = "http://localhost:5200"; } return $url; } diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml index 67a7e0f98..fc6f8db5f 100644 --- a/tests/acceptance/docker/src/acceptance.yml +++ b/tests/acceptance/docker/src/acceptance.yml @@ -9,7 +9,7 @@ services: RUN_ON_OCIS: "true" TEST_SERVER_URL: https://ocis-server:9200 TEST_WITH_GRAPH_API: "true" - OCIS_WRAPPER_URL: http://ocis-server:5000 + OCIS_WRAPPER_URL: http://ocis-server:5200 STORAGE_DRIVER: $STORAGE_DRIVER TEST_SOURCE: $TEST_SOURCE BEHAT_SUITE: ${BEHAT_SUITE:-} diff --git a/tests/ociswrapper/.gitignore b/tests/ociswrapper/.gitignore index ba077a403..e660fd93d 100644 --- a/tests/ociswrapper/.gitignore +++ b/tests/ociswrapper/.gitignore @@ -1 +1 @@ -bin +bin/ diff --git a/tests/ociswrapper/README.md b/tests/ociswrapper/README.md index 41ce7067d..7b255b7c6 100644 --- a/tests/ociswrapper/README.md +++ b/tests/ociswrapper/README.md @@ -18,7 +18,7 @@ When run, **ociswrapper** starts an API server that exposes some endpoints to re ./bin/ociswrapper serve --bin= ``` -Access the API server at `http://localhost:5000`. +Access the API server at `http://localhost:5200`. Also, see `./bin/ociswrapper help` for more information. diff --git a/tests/ociswrapper/bin/ociswrapper b/tests/ociswrapper/bin/ociswrapper deleted file mode 100755 index b7d96a15c..000000000 Binary files a/tests/ociswrapper/bin/ociswrapper and /dev/null differ diff --git a/tests/ociswrapper/wrapper/config/config.go b/tests/ociswrapper/wrapper/config/config.go index b73aaa62a..a48d4bcb5 100644 --- a/tests/ociswrapper/wrapper/config/config.go +++ b/tests/ociswrapper/wrapper/config/config.go @@ -1,7 +1,7 @@ package config var config = map[string]string{ - "port": "5000", + "port": "5200", } func Get(key string) string {