summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2017-02-10 16:20:25 +0100
committerMorris Jobke <hey@morrisjobke.de>2017-03-20 12:34:05 -0600
commit5bfce597a92a3b1f84d12f0886c620d425aaba26 (patch)
tree8a78659ea210e4e25d43a2c5961d3b718a7ea408 /apps
parentdaa7e1109598417e133d756083b8fc8c75a2850f (diff)
downloadnextcloud-server-5bfce597a92a3b1f84d12f0886c620d425aaba26.tar.gz
nextcloud-server-5bfce597a92a3b1f84d12f0886c620d425aaba26.zip
[CI] Can we get some faster phpunit execution? (#27113)
* Don't backup globals and static attributes * Unset global variable to remove impact on followup tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/tests/unit/Connector/Sabre/FileTest.php3
-rw-r--r--apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php2
-rw-r--r--apps/files_sharing/tests/Controller/ShareAPIControllerTest.php3
3 files changed, 7 insertions, 1 deletions
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index 999326463a1..31344b36463 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -48,6 +48,9 @@ class FileTest extends \Test\TestCase {
public function setUp() {
parent::setUp();
+ unset($_SERVER['HTTP_OC_CHUNKED']);
+ unset($_SERVER['CONTENT_LENGTH']);
+ unset($_SERVER['REQUEST_METHOD']);
\OC_Hook::clear();
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php
index 8b06678407b..10cd73baf63 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php
@@ -57,6 +57,8 @@ abstract class RequestTest extends TestCase {
protected function setUp() {
parent::setUp();
+ unset($_SERVER['HTTP_OC_CHUNKED']);
+
$this->serverFactory = new ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index 97774081b6a..726c4bde315 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -38,6 +38,7 @@ use OCP\Files\IRootFolder;
use OCP\Lock\LockedException;
use OCP\Share\IManager;
use OCP\Share;
+use Test\TestCase;
/**
* Class ShareAPIControllerTest
@@ -45,7 +46,7 @@ use OCP\Share;
* @package OCA\Files_Sharing\Tests\Controller
* @group DB
*/
-class ShareAPIControllerTest extends \Test\TestCase {
+class ShareAPIControllerTest extends TestCase {
/** @var string */
private $appName = 'files_sharing';