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-25 20:18:24 +02:00
commit 592c0d6551
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
if (! function_exists('PMA_supportedDataTypesDescriptions')) {
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'
);

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

@ -20,7 +20,15 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['ShowFunctionFields'] = false;
include 'libraries/data_mysql.inc.php';
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';
}
if (! function_exists('PMA_generateCharsetDropdownBox')) {
function PMA_generateCharsetDropdownBox() {}

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

@ -20,6 +20,15 @@ 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';
}
if (! defined('PMA_MYSQL_INT_VERSION')) {
define('PMA_MYSQL_INT_VERSION', 51000);
}
@ -54,7 +63,6 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase
$cfg['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText';
$GLOBALS['tear_down']['default'] = true;
}
include 'libraries/data_mysql.inc.php';
}
public function tearDown()

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

@ -29,7 +29,14 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
include 'libraries/data_mysql.inc.php';
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';
}
$errors = array();
PMA_RTN_setGlobals();