diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2016-07-13 16:42:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 16:42:51 +0200 |
| commit | e1bad212cf1a9e1edccaf3205f3a83c6c1281ace (patch) | |
| tree | 573545347759c2535ac604e1a51eb81821f44521 | |
| parent | 403c76c1eb032afd7c2ab745a1ffebf649266af7 (diff) | |
| parent | f2d091a963ab1fd76f36e6fcd038c0e6b63dba6f (diff) | |
| download | nextcloud-server-e1bad212cf1a9e1edccaf3205f3a83c6c1281ace.tar.gz nextcloud-server-e1bad212cf1a9e1edccaf3205f3a83c6c1281ace.zip | |
Merge pull request #387 from nextcloud/drone_split_ci
Split CI in DB & NODB
| -rw-r--r-- | .drone.yml | 36 | ||||
| -rw-r--r-- | tests/lib/User/ManagerTest.php | 8 | ||||
| -rw-r--r-- | tests/lib/UserTest.php | 2 |
3 files changed, 35 insertions, 11 deletions
diff --git a/.drone.yml b/.drone.yml index 2b17ba42f77..2798176c9a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,44 +3,68 @@ build: image: nextcloudci/jsunit:1.0.6 commands: - ./autotest-js.sh + nodb-php5.4: + image: nextcloudci/php5.4:1.0.7 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite + nodb-php5.5: + image: nextcloudci/php5.5:1.0.7 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite + nodb-php5.6: + image: nextcloudci/php5.6:1.0.6 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite + nodb-php7.0: + image: nextcloudci/php7.0:1.0.9 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite sqlite-php5.4: image: nextcloudci/php5.4:1.0.7 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh sqlite + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite sqlite-php5.5: image: nextcloudci/php5.5:1.0.7 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh sqlite + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite sqlite-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh sqlite + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite sqlite-php7.0: image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh sqlite + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite mysql-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh mysql + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql postgres-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - NOCOVERAGE=true ./autotest.sh pgsql + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql integration: image: nextcloudci/php7.0:1.0.9 commands: diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 2a6cdbc1355..f1b520ee0cf 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -129,7 +129,7 @@ class ManagerTest extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) { + if ($actions === \OC\USER\BACKEND::CHECK_PASSWORD) { return true; } else { return false; @@ -384,7 +384,7 @@ class ManagerTest extends \Test\TestCase { $backend->expects($this->once()) ->method('implementsActions') - ->with(\OC_USER_BACKEND_COUNT_USERS) + ->with(\OC\USER\BACKEND::COUNT_USERS) ->will($this->returnValue(true)); $backend->expects($this->once()) @@ -413,7 +413,7 @@ class ManagerTest extends \Test\TestCase { $backend1->expects($this->once()) ->method('implementsActions') - ->with(\OC_USER_BACKEND_COUNT_USERS) + ->with(\OC\USER\BACKEND::COUNT_USERS) ->will($this->returnValue(true)); $backend1->expects($this->once()) ->method('getBackendName') @@ -426,7 +426,7 @@ class ManagerTest extends \Test\TestCase { $backend2->expects($this->once()) ->method('implementsActions') - ->with(\OC_USER_BACKEND_COUNT_USERS) + ->with(\OC\USER\BACKEND::COUNT_USERS) ->will($this->returnValue(true)); $backend2->expects($this->once()) ->method('getBackendName') diff --git a/tests/lib/UserTest.php b/tests/lib/UserTest.php index 456e864ab75..7a033c2921e 100644 --- a/tests/lib/UserTest.php +++ b/tests/lib/UserTest.php @@ -41,7 +41,7 @@ class UserTest extends TestCase { $this->backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) { + if ($actions === \OC\USER\BACKEND::CHECK_PASSWORD) { return true; } else { return false; |