Lukas Reschke
10 years ago
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
6 changed files with
26 additions and
11 deletions
.drone.yml
apps/files_sharing/tests/EtagPropagationTest.php
apps/files_sharing/tests/GroupEtagPropagationTest.php
apps/files_sharing/tests/SharedMountTest.php
autotest.sh
tests/lib/TestCase.php
@ -301,7 +301,7 @@ pipeline:
when:
matrix:
TESTS : integration-sharees-features
codecov:
nodb- codecov:
image : nextcloudci/php7.0:php7.0-2
commands:
- TEST_SELECTION=NODB ./autotest.sh sqlite
@ -310,12 +310,22 @@ pipeline:
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS : codecov
TESTS : nodb-codecov
db-codecov:
image : nextcloudci/php7.0:php7.0-2
commands:
- TEST_SELECTION=QUICKDB ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS : db-codecov
matrix:
include:
- TESTS : signed-off-check
- TESTS : codecov
- TESTS : nodb-codecov
- TESTS : db-codecov
- TESTS : integration-capabilities_features
- TESTS : integration-federation_features
- TESTS : integration-auth
@ -34,7 +34,7 @@ use OC\Files\View;
/**
* Class EtagPropagationTest
*
* @ group DB
* @ group SLOW DB
*
* @ package OCA\Files_Sharing\Tests
*/
@ -28,7 +28,7 @@ use OC\Files\Filesystem;
use OC\Files\View ;
/**
* @ group DB
* @ group SLOW DB
*
* @ package OCA\Files_Sharing\Tests
*/
@ -31,7 +31,7 @@ namespace OCA\Files_Sharing\Tests;
/**
* Class SharedMountTest
*
* @ group DB
* @ group SLOW DB
*/
class SharedMountTest extends TestCase {
@ -293,11 +293,14 @@ function execute_tests {
export XDEBUG_CONFIG = $_XDEBUG_CONFIG
fi
GROUP = ''
if [ " $TEST_SELECTION " = = "QUICKDB" ] ; then
GROUP = '--group DB --exclude-group=SLOWDB'
fi
if [ " $TEST_SELECTION " = = "DB" ] ; then
GROUP = '--group DB'
GROUP = '--group DB,SLOWDB '
fi
if [ " $TEST_SELECTION " = = "NODB" ] ; then
GROUP = '--exclude-group DB'
GROUP = '--exclude-group DB,SLOWDB '
fi
COVER = ''
@ -435,8 +435,10 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
return true ;
}
$annotations = $this -> getAnnotations ();
if ( isset ( $annotations [ 'class' ][ 'group' ]) && in_array ( 'DB' , $annotations [ 'class' ][ 'group' ])) {
return true ;
if ( isset ( $annotations [ 'class' ][ 'group' ])) {
if ( in_array ( 'DB' , $annotations [ 'class' ][ 'group' ]) || in_array ( 'SLOWDB' , $annotations [ 'class' ][ 'group' ]) ) {
return true ;
}
}
return false ;