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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-26 10:32:04 +02:00
commit de6ef6e29e
4 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
View File

@ -22,13 +22,7 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
if (function_exists('PMA_supportedDataTypesDescriptions')) {
$this->markTestSkipped(
'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point'
);
} else {
include 'libraries/data_mysql.inc.php';
}
include 'libraries/data_mysql.inc.php';
}
/**

9
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -21,14 +21,7 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
if (function_exists('PMA_supportedDataTypesDescriptions')) {
$this->markTestSkipped(
'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point'
);
return;
} else {
include 'libraries/data_mysql.inc.php';
}
include 'libraries/data_mysql.inc.php';
if (! function_exists('PMA_generateCharsetDropdownBox')) {
function PMA_generateCharsetDropdownBox() {}

9
test/libraries/rte/PMA_RTN_getExecuteForm_test.php
View File

@ -20,14 +20,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase
{
global $cfg;
if (function_exists('PMA_supportedDataTypesDescriptions')) {
$this->markTestSkipped(
'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point'
);
return;
} else {
include 'libraries/data_mysql.inc.php';
}
include 'libraries/data_mysql.inc.php';
if (! defined('PMA_MYSQL_INT_VERSION')) {
define('PMA_MYSQL_INT_VERSION', 51000);

9
test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
View File

@ -29,14 +29,7 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
if (function_exists('PMA_supportedDataTypesDescriptions')) {
$this->markTestSkipped(
'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point'
);
return;
} else {
include 'libraries/data_mysql.inc.php';
}
include 'libraries/data_mysql.inc.php';
$errors = array();
PMA_RTN_setGlobals();