Skip to content

Commit

Permalink
Set correct Uptime value for tests
Browse files Browse the repository at this point in the history
MySQL returns this as integer, so we should do the same for tests.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel committed Dec 13, 2016
1 parent 1fd24b6 commit 28968fe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions test/libraries/PMA_server_status_queries_test.php
Expand Up @@ -114,8 +114,7 @@ public function setUp()

$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",
Expand Down
3 changes: 1 addition & 2 deletions test/libraries/PMA_server_status_test.php
Expand Up @@ -152,13 +152,12 @@ public function setUp()
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;
Expand Down

0 comments on commit 28968fe

Please sign in to comment.