gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix running tests in --process-isolation

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-05-21 14:55:53 +02:00
parent 3a49cb33bb
commit ae575ffb14
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
62 changed files with 78 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/classes/CharsetsTest.php
View File

@ -17,6 +17,7 @@ class CharsetsTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['DBG']['sql'] = false;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
}

2
test/classes/Config/FormDisplayTest.php
View File

@ -31,9 +31,9 @@ class FormDisplayTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::loadDefaultConfig();
parent::defineVersionConstants();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
parent::setGlobalConfig();
$GLOBALS['server'] = 0;

2
test/classes/Config/FormTest.php
View File

@ -29,9 +29,9 @@ class FormTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::loadDefaultConfig();
parent::defineVersionConstants();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
parent::setGlobalConfig();
$GLOBALS['server'] = 0;

1
test/classes/ConfigTest.php
View File

@ -56,6 +56,7 @@ class ConfigTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
$_SERVER['HTTP_USER_AGENT'] = '';
$this->object = new Config();

1
test/classes/Controllers/Database/PrivilegesControllerTest.php
View File

@ -18,6 +18,7 @@ class PrivilegesControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
parent::setLanguage();
}

1
test/classes/Controllers/Database/StructureControllerTest.php
View File

@ -61,6 +61,7 @@ class StructureControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['server'] = 1;

1
test/classes/Controllers/Server/Status/VariablesControllerTest.php
View File

@ -22,6 +22,7 @@ class VariablesControllerTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setGlobalConfig();
$GLOBALS['PMA_Config']->enableBc();

2
test/classes/Controllers/Server/VariablesControllerTest.php
View File

@ -28,7 +28,9 @@ class VariablesControllerTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setGlobalConfig();
parent::setLanguage();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['text_dir'] = 'ltr';

1
test/classes/Controllers/Table/FindReplaceControllerTest.php
View File

@ -16,6 +16,7 @@ class FindReplaceControllerTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setLanguage();
parent::setGlobalConfig();
$GLOBALS['PMA_Config']->enableBc();

1
test/classes/Controllers/Table/IndexesControllerTest.php
View File

@ -33,6 +33,7 @@ class IndexesControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
/**

2
test/classes/Controllers/Table/PrivilegesControllerTest.php
View File

@ -18,7 +18,9 @@ class PrivilegesControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
parent::setLanguage();
}
public function testIndex(): void

1
test/classes/Controllers/Table/RelationControllerTest.php
View File

@ -32,6 +32,7 @@ class RelationControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;

1
test/classes/Controllers/Table/SearchControllerTest.php
View File

@ -35,6 +35,7 @@ class SearchControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
/**

1
test/classes/Controllers/Table/StructureControllerTest.php
View File

@ -39,6 +39,7 @@ class StructureControllerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['server'] = 1;

1
test/classes/CoreTest.php
View File

@ -30,6 +30,7 @@ class CoreTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::setLanguage();
parent::loadDefaultConfig();

1
test/classes/Database/Designer/CommonTest.php
View File

@ -25,6 +25,7 @@ class CommonTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 1;
$_SESSION = [
'relation' => [

2
test/classes/Database/DesignerTest.php
View File

@ -27,6 +27,8 @@ class DesignerTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['cfg']['PDFPageSizes'] = [

1
test/classes/Database/QbeTest.php
View File

@ -30,6 +30,7 @@ class QbeTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['db'] = 'pma_test';
$this->object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');

2
test/classes/Database/TriggersTest.php
View File

@ -22,7 +22,9 @@ class TriggersTest extends AbstractTestCase
{
parent::setUp();
parent::setGlobalConfig();
parent::defineVersionConstants();
parent::setLanguage();
$GLOBALS['server'] = 0;
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['db'] = 'pma_test';

1
test/classes/DatabaseInterfaceTest.php
View File

@ -28,6 +28,7 @@ class DatabaseInterfaceTest extends PmaTestCase
{
parent::setUp();
parent::loadDefaultConfig();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$extension = new DbiDummy();
$this->_dbi = new DatabaseInterface($extension);

3
test/classes/Display/ResultsTest.php
View File

@ -37,13 +37,14 @@ class ResultsTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::setGlobalConfig();
$GLOBALS['server'] = 0;
$GLOBALS['db'] = 'db';
$GLOBALS['table'] = 'table';
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
$this->object = new DisplayResults('as', '', 0, '', '');
parent::setGlobalConfig();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['cfg']['Server']['DisableIS'] = false;

1
test/classes/ErrorReportTest.php
View File

@ -33,6 +33,7 @@ class ErrorReportTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['cfg']['ProxyUrl'] = '';

5
test/classes/FilesTest.php
View File

@ -1,6 +1,6 @@
<?php
/**
* tests for bookmark.lib.php
* tests for PhpMyAdmin\Bookmark
*/
declare(strict_types=1);
@ -10,7 +10,7 @@ use PhpMyAdmin\OutputBuffering;
use PhpMyAdmin\Tests\AbstractTestCase;
/**
* tests for bookmark.lib.php
* tests for PhpMyAdmin\Bookmark
*/
class FilesTest extends AbstractTestCase
{
@ -20,6 +20,7 @@ class FilesTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
}

1
test/classes/HeaderTest.php
View File

@ -26,6 +26,7 @@ class HeaderTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::setLanguage();
if (! defined('PMA_IS_WINDOWS')) {

1
test/classes/InsertEditTest.php
View File

@ -37,6 +37,7 @@ class InsertEditTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::setGlobalConfig();
parent::loadDefaultConfig();

1
test/classes/MenuTest.php
View File

@ -22,6 +22,7 @@ class MenuTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::loadDefaultConfig();

1
test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
View File

@ -32,6 +32,7 @@ class NodeDatabaseChildTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
parent::setLanguage();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();

1
test/classes/Navigation/Nodes/NodeDatabaseTest.php
View File

@ -21,6 +21,7 @@ class NodeDatabaseTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';

1
test/classes/NormalizationTest.php
View File

@ -32,6 +32,7 @@ class NormalizationTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['cfg']['LimitChars'] = 50;
$GLOBALS['cfg']['ServerDefault'] = 'PMA_server';
$GLOBALS['cfg']['ShowHint'] = true;

1
test/classes/Plugins/Auth/AuthenticationCookieTest.php
View File

@ -38,6 +38,7 @@ class AuthenticationCookieTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::setTheme();
parent::setGlobalConfig();

6
test/classes/Plugins/Auth/AuthenticationSignonTest.php
View File

@ -31,6 +31,8 @@ class AuthenticationSignonTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::setGlobalConfig();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
@ -157,7 +159,9 @@ class AuthenticationSignonTest extends PmaTestCase
*/
public function testAuthCheckToken()
{
$_SESSION = [];
$_SESSION = [
' PMA_token ' => 'eefefef',
];
$this->mockResponse('Location: https://example.com/SignonURL');
$GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';

1
test/classes/Plugins/Export/ExportHtmlwordTest.php
View File

@ -38,6 +38,7 @@ class ExportHtmlwordTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$this->object = new ExportHtmlword();

1
test/classes/Plugins/Export/ExportJsonTest.php
View File

@ -33,6 +33,7 @@ class ExportJsonTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

1
test/classes/Plugins/Export/ExportLatexTest.php
View File

@ -37,6 +37,7 @@ class ExportLatexTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;

1
test/classes/Plugins/Export/ExportOdsTest.php
View File

@ -35,6 +35,7 @@ class ExportOdsTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

1
test/classes/Plugins/Export/ExportOdtTest.php
View File

@ -36,6 +36,7 @@ class ExportOdtTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;

1
test/classes/Plugins/Export/ExportPdfTest.php
View File

@ -33,6 +33,7 @@ class ExportPdfTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

1
test/classes/Plugins/Export/ExportPhparrayTest.php
View File

@ -34,6 +34,7 @@ class ExportPhparrayTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

1
test/classes/Plugins/Export/ExportSqlTest.php
View File

@ -42,6 +42,7 @@ class ExportSqlTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$GLOBALS['db'] = 'db';

1
test/classes/Plugins/Export/ExportTexytextTest.php
View File

@ -37,6 +37,7 @@ class ExportTexytextTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;

1
test/classes/Plugins/Export/ExportXmlTest.php
View File

@ -36,6 +36,7 @@ class ExportXmlTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['buffer_needed'] = false;

1
test/classes/Plugins/Schema/DiaRelationSchemaTest.php
View File

@ -28,6 +28,7 @@ class DiaRelationSchemaTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$_REQUEST['page_number'] = 33;
$_REQUEST['dia_show_color'] = true;
$_REQUEST['dia_show_keys'] = true;

1
test/classes/Plugins/Schema/EpsRelationSchemaTest.php
View File

@ -28,6 +28,7 @@ class EpsRelationSchemaTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$_REQUEST['page_number'] = 33;
$_REQUEST['eps_show_color'] = true;
$_REQUEST['eps_show_keys'] = true;

1
test/classes/Plugins/Schema/ExportRelationSchemaTest.php
View File

@ -26,6 +26,7 @@ class ExportRelationSchemaTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$_REQUEST['page_number'] = 33;
$this->object = new ExportRelationSchema('information_schema', null);
}

1
test/classes/Plugins/Schema/PdfRelationSchemaTest.php
View File

@ -28,6 +28,7 @@ class PdfRelationSchemaTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$_REQUEST['page_number'] = 33;
$_REQUEST['pdf_show_grid'] = true;
$_REQUEST['pdf_show_color'] = true;

1
test/classes/Plugins/Schema/SvgRelationSchemaTest.php
View File

@ -28,6 +28,7 @@ class SvgRelationSchemaTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$_REQUEST['page_number'] = 33;
$_REQUEST['svg_show_color'] = true;
$_REQUEST['svg_show_keys'] = true;

1
test/classes/RelationCleanupTest.php
View File

@ -31,6 +31,7 @@ class RelationCleanupTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 1;
$_SESSION['relation'] = [];
$_SESSION['relation'][$GLOBALS['server']] = [

1
test/classes/RelationTest.php
View File

@ -29,6 +29,7 @@ class RelationTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
$GLOBALS['server'] = 1;
$GLOBALS['db'] = 'db';

1
test/classes/Server/UserGroupsTest.php
View File

@ -23,6 +23,7 @@ class UserGroupsTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['cfg']['ActionLinksMode'] = 'both';

1
test/classes/Setup/FormProcessingTest.php
View File

@ -23,6 +23,7 @@ class FormProcessingTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
parent::setLanguage();
$GLOBALS['server'] = 1;

1
test/classes/SqlQueryFormTest.php
View File

@ -32,6 +32,7 @@ class SqlQueryFormTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
$this->sqlQueryForm = new SqlQueryForm(new Template());

3
test/classes/SqlTest.php
View File

@ -25,6 +25,9 @@ class SqlTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::loadDefaultConfig();
$GLOBALS['server'] = 1;
$GLOBALS['db'] = 'db';
$GLOBALS['table'] = 'table';

1
test/classes/SystemDatabaseTest.php
View File

@ -29,6 +29,7 @@ class SystemDatabaseTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
/**
* SET these to avoid undefine d index error
*/

1
test/classes/TableTest.php
View File

@ -25,6 +25,7 @@ class TableTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::loadDefaultConfig();
/**

3
test/classes/ThemeManagerTest.php
View File

@ -21,11 +21,12 @@ class ThemeManagerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setGlobalConfig();
$GLOBALS['cfg']['ThemePerServer'] = false;
$GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['server'] = 99;
parent::setGlobalConfig();
$dbi = $this->getMockBuilder(DatabaseInterface::class)
->disableOriginalConstructor()

1
test/classes/ThemeTest.php
View File

@ -28,6 +28,7 @@ class ThemeTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setTheme();
$this->object = new Theme();
$this->backup = $GLOBALS['PMA_Theme'];

1
test/classes/TrackerTest.php
View File

@ -26,6 +26,7 @@ class TrackerTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
/**
* SET these to avoid undefined index error
*/

1
test/classes/TrackingTest.php
View File

@ -32,6 +32,7 @@ class TrackingTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
/**
* SET these to avoid undefined index error
*/

1
test/classes/TransformationsTest.php
View File

@ -24,6 +24,7 @@ class TransformationsTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['table'] = 'table';
$GLOBALS['db'] = 'db';
$GLOBALS['cfg'] = [

1
test/classes/TwoFactorTest.php
View File

@ -21,6 +21,7 @@ class TwoFactorTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
$GLOBALS['server'] = 1;
$GLOBALS['db'] = 'db';
$GLOBALS['table'] = 'table';

5
test/classes/UserPreferencesTest.php
View File

@ -28,9 +28,10 @@ class UserPreferencesTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
global $cfg;
include ROOT_PATH . 'libraries/config.default.php';
parent::loadDefaultConfig();
parent::defineVersionConstants();
$GLOBALS['server'] = 0;
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/';
$cfg['Server']['DisableIS'] = false;

1
test/classes/UtilTest.php
View File

@ -36,6 +36,7 @@ class UtilTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::defineVersionConstants();
parent::setLanguage();
parent::setTheme();
parent::loadDefaultConfig();