diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index c7b5b95c5c..e7ae440174 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -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' ); diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index b0674f479b..720813a197 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -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() {} diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index aeea93fa5a..0b1ce5c201 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -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() diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index 2d2717eb5d..56e548cb4b 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -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();