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 2016-09-06 09:49:06 +02:00
commit 477acc6321
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/libraries/PMA_server_status_queries_test.php
View File

@ -106,8 +106,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
$GLOBALS['dbi'] = $dbi;
$this->ServerStatusData = new ServerStatusData();
$upTime = "10h";
$this->ServerStatusData->status['Uptime'] = $upTime;
$this->ServerStatusData->status['Uptime'] = 36000;
$this->ServerStatusData->used_queries = array(
"Com_change_db" => "15",
"Com_select" => "12",

3
test/libraries/PMA_server_status_test.php
View File

@ -147,13 +147,12 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
public function testPMAGetHtmlForServerStatus()
{
//parameters
$upTime = "10h";
$bytes_received = 100;
$bytes_sent = 200;
$max_used_conn = 500;
$aborted_conn = 200;
$conn = 1000;
$this->ServerStatusData->status['Uptime'] = $upTime;
$this->ServerStatusData->status['Uptime'] = 36000;
$this->ServerStatusData->status['Bytes_received'] = $bytes_received;
$this->ServerStatusData->status['Bytes_sent'] = $bytes_sent;
$this->ServerStatusData->status['Max_used_connections'] = $max_used_conn;