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:
Weblate 2014-07-06 12:58:42 +02:00
commit 6544c2f955
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/classes/PMA_Config_test.php
View File

@ -1036,6 +1036,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
*
* @return void
*/
/*
public function testCheckHTTP()
{
if (! function_exists('curl_init')) {
@ -1052,7 +1053,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
$this->object->checkHTTP("http://www.phpmyadmin.net/test/nothing")
);
}
*/
/**
* Tests for rewriting URL to SSL variant
*

3
test/classes/PMA_Util_test.php
View File

@ -105,6 +105,7 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase
*
* @group large
*/
/*
public function testGetLatestVersion()
{
$GLOBALS['cfg']['ProxyUrl'] = '';
@ -113,7 +114,7 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase
$this->assertNotEmpty($version->version);
$this->assertNotEmpty($version->date);
}
*/
/**
* Test version to int conversion.
*

6
test/libraries/PMA_SetupIndex_test.php
View File

@ -184,6 +184,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
*
* @group medium
*/
/*
public function testPMAVersionCheckCase1()
{
$pmaconfig = $this->getMockBuilder('PMA_Config')
@ -226,6 +227,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
$notice['message']
);
}
*/
/**
* Test for PMA_versionCheck
@ -234,6 +236,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
*
* @group medium
*/
/*
public function testPMAVersionCheckCase2()
{
$pmaconfig = $this->getMockBuilder('PMA_Config')
@ -276,6 +279,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
$notice['message']
);
}
*/
/**
* Test for PMA_versionCheck
@ -284,6 +288,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
*
* @group medium
*/
/*
public function testPMAVersionCheckCase3()
{
$pmaconfig = $this->getMockBuilder('PMA_Config')
@ -327,6 +332,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
);
}
*/
/**
* Test for PMA_checkConfigRw
*