Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/classes/ConfigTest.php3
-rw-r--r--test/classes/OperationsTest.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index 8382fbadb7..954f21047e 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -1087,7 +1087,6 @@ class ConfigTest extends PmaTestCase
$this->object->get('PMA_VERSION_GIT_COMMITHASH')
);
-
file_put_contents('.git/HEAD','ref: refs/remotes/origin/master');
$this->object->checkGitRevision();
$this->assertEmpty(
@@ -1152,7 +1151,6 @@ class ConfigTest extends PmaTestCase
$this->object->get('PMA_VERSION_GIT_COMMITHASH')
);
-
file_put_contents('.git/HEAD','ref: refs/remotes/origin/master');
mkdir('.git/refs/remotes/origin', 0777, true);
file_put_contents('.git/refs/remotes/origin/master','c1f2ff2eb0c3fda741f859913fd589379f4e4a8f');
@@ -1209,7 +1207,6 @@ class ConfigTest extends PmaTestCase
$this->object->get('PMA_VERSION_GIT_COMMITHASH')
);
-
file_put_contents('.git/HEAD','ref: refs/remotes/origin/master');
$this->object->checkGitRevision();
$this->assertEmpty(
diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php
index 8704b97764..ca9893e0ea 100644
--- a/test/classes/OperationsTest.php
+++ b/test/classes/OperationsTest.php
@@ -243,6 +243,8 @@ class OperationsTest extends TestCase
*/
public function testGetHtmlForReferentialIntegrityCheck()
{
+ $GLOBALS['cfg']['blowfish_secret'] = '';
+ $_SESSION[' HMAC_secret '] = hash('sha1', 'test');
$this->assertRegExp(
'/.*Check referential integrity.*href="sql.php(.|[\n])*/m',