Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)"

This reverts commit 9403921e4e689be0e62ccc23e9634039e94792ea.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php

2 files changed, 4 insertions, 4 deletions

diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index b6a124c725..899b6891e2 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -11,6 +11,7 @@
  * Include to test.
  */
 require_once 'libraries/core.lib.php';
+require_once 'libraries/Util.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/Theme.class.php';
@@ -1031,7 +1032,6 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    /*
     public function testCheckHTTP()
     {
         if (! function_exists('curl_init')) {
@@ -1048,7 +1048,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
             $this->object->checkHTTP("http://www.phpmyadmin.net/test/nothing")
         );
     }
-    */
+
     /**
      * Tests for rewriting URL to SSL variant
      *
diff --git a/test/classes/PMA_Util_test.php b/test/classes/PMA_Util_test.php
index 73657acf91..ee8edbf2f4 100644
--- a/test/classes/PMA_Util_test.php
+++ b/test/classes/PMA_Util_test.php
@@ -114,16 +114,16 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase
      *
      * @group large
      */
-    /*
     public function testGetLatestVersion()
     {
         $GLOBALS['cfg']['ProxyUrl'] = '';
         $GLOBALS['cfg']['VersionCheckProxyUrl'] = '';
+        $GLOBALS['cfg']['VersionCheck'] = true;
         $version = PMA_Util::getLatestVersion();
         $this->assertNotEmpty($version->version);
         $this->assertNotEmpty($version->date);
     }
-    */
+
     /**
      * Test version to int conversion.
      *