Переглянути джерело

[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>
tags/v12.0.0beta1
Thomas Müller 7 роки тому
джерело
коміт
5bfce597a9
Аккаунт користувача з таким Email не знайдено

+ 3
- 0
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();


+ 2
- 0
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(),

+ 2
- 1
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';

+ 9
- 4
tests/lib/Repair/RepairCollationTest.php Переглянути файл

@@ -8,10 +8,15 @@

namespace Test\Repair;

use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Platforms\MySqlPlatform;
use OC\Repair\Collation;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\Migration\IOutput;
use Test\TestCase;

class TestCollationRepair extends \OC\Repair\Collation {
class TestCollationRepair extends Collation {
/**
* @param \Doctrine\DBAL\Connection $connection
* @return string[]
@@ -28,7 +33,7 @@ class TestCollationRepair extends \OC\Repair\Collation {
*
* @see \OC\Repair\RepairMimeTypes
*/
class RepairCollationTest extends \Test\TestCase {
class RepairCollationTest extends TestCase {

/**
* @var TestCollationRepair
@@ -36,7 +41,7 @@ class RepairCollationTest extends \Test\TestCase {
private $repair;

/**
* @var \Doctrine\DBAL\Connection
* @var Connection|IDBConnection
*/
private $connection;

@@ -59,7 +64,7 @@ class RepairCollationTest extends \Test\TestCase {
$this->connection = \OC::$server->getDatabaseConnection();
$this->logger = $this->createMock(ILogger::class);
$this->config = \OC::$server->getConfig();
if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
$this->markTestSkipped("Test only relevant on MySql");
}


+ 1
- 0
tests/phpunit-autotest.xml Переглянути файл

@@ -2,6 +2,7 @@
<phpunit bootstrap="bootstrap.php"
strict="true"
verbose="true"
backupGlobals="false"
timeoutForSmallTests="900"
timeoutForMediumTests="900"
timeoutForLargeTests="900"

Завантаження…
Відмінити
Зберегти