From f23c0b9db946f612f7f3f9fee4a1093f2e4ff833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 09:48:14 +0200 Subject: [PATCH] Set correct Uptime value for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MySQL returns this as integer, so we should do the same for tests. See also #12539 Signed-off-by: Michal Čihař --- test/libraries/PMA_server_status_queries_test.php | 3 +-- test/libraries/PMA_server_status_test.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php index f6b42a6c79..af23c3bfc3 100644 --- a/test/libraries/PMA_server_status_queries_test.php +++ b/test/libraries/PMA_server_status_queries_test.php @@ -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", diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index 9d9c4f0575..b17267073a 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -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;