Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only] [full-ci] Remove unused make target #3622

Merged
merged 1 commit into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,12 @@ def virtualViews():
"name": "APIAcceptanceTestsOcisStorage",
"image": OC_CI_PHP,
"commands": [
"cd /drone/src",
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-api",
"make test-acceptance-from-core-api",
],
"environment": {
"PATH_TO_APITESTS": "/drone/src/tmp/testrunner",
"TEST_SERVER_URL": "http://revad-services:20180",
"OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
"DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/spaces/* /drone/src/tmp/reva/data/blobs/* /drone/src/tmp/reva/data/indexes",
Expand Down
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,6 @@ mockery: $(MOCKERY)
go-generate:
go generate ./...

BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
# behat config file for core api tests
CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml

test-acceptance-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api

test-acceptance-core-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api

vendor/bamarni/composer-bin-plugin: composer.lock
composer install

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
../../../cmd/revad/revad -c ldap-users.toml
```

3. clone ownCloud 10
3. clone ownCloud Infinite Scale `OCIS`
```
git clone https://github.com/owncloud/core.git ./testrunner
git clone https://github.com/owncloud/ocis.git ./testrunner
```

4. to run the correct version of the testsuite check out the commit id from the `.drone.env` file
Expand All @@ -156,7 +156,7 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
TEST_REVA='true' \
BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis' \
EXPECTED_FAILURES_FILE=../reva/tests/acceptance/expected-failures-on-OCIS-storage.md \
make test-acceptance-api
make test-acceptance-from-core-api
```

This will run all tests that are relevant to reva.
Expand Down
9 changes: 2 additions & 7 deletions tests/acceptance/features/bootstrap/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<?php
$pathToApiTests = \getenv('PATH_TO_APITESTS');
if ($pathToApiTests === false) {
$pathToApiTests = "../ocis";
}

require_once $pathToApiTests . '/tests/acceptance/features/bootstrap/bootstrap.php';
require_once '../ocis/tests/acceptance/features/bootstrap/bootstrap.php';

$classLoader = new \Composer\Autoload\ClassLoader();
$classLoader->addPsr4(
"", $pathToApiTests . "/tests/acceptance/features/bootstrap", true
"", "../ocis/tests/acceptance/features/bootstrap", true
);

$classLoader->register();