From bbda0a48ea07d88d2760ca4fff11d9bf37a3e0b8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 6 Apr 2018 05:26:52 +0000 Subject: [PATCH] net/relayd: fix test after fiddling with settings controller CC: @fbrendel --- net/relayd/Makefile | 5 ----- .../mvc/tests/app/compound/OPNsense/Relayd/RelaydTest.php | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/net/relayd/Makefile b/net/relayd/Makefile index 859889be0..f8539d307 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -5,9 +5,4 @@ PLUGIN_DEPENDS= relayd PLUGIN_COMMENT= Relayd Load Balancer PLUGIN_MAINTAINER= frank.brendel@eurolog.com -test: - @cd /usr/local/opnsense/mvc/tests && \ - phpunit --configuration PHPunit.xml \ - ${.CURDIR}/src/opnsense/mvc/tests - .include "../../Mk/plugins.mk" diff --git a/net/relayd/src/opnsense/mvc/tests/app/compound/OPNsense/Relayd/RelaydTest.php b/net/relayd/src/opnsense/mvc/tests/app/compound/OPNsense/Relayd/RelaydTest.php index 5450c97c0..346008d5d 100644 --- a/net/relayd/src/opnsense/mvc/tests/app/compound/OPNsense/Relayd/RelaydTest.php +++ b/net/relayd/src/opnsense/mvc/tests/app/compound/OPNsense/Relayd/RelaydTest.php @@ -125,7 +125,7 @@ class RelaydTest extends \PHPUnit\Framework\TestCase // set correct interval and incorrect timeout (s. testServiceController) $_POST = array('relayd' => ['general' => ['interval' => '10', 'timeout' => 86400, 'enabled' => '0']]); $response = self::$setRelayd->setAction('general'); - $this->assertEquals($response['response'], "OK\n\n"); + $this->assertEquals($response['status'], 'ok'); } /** @@ -386,7 +386,7 @@ class RelaydTest extends \PHPUnit\Framework\TestCase ); $_POST = array('relayd' => ['general' => ['timeout' => '200']]); $response = self::$setRelayd->setAction('general'); - $this->assertEquals($response['result'], 'ok'); + $this->assertEquals($response['status'], 'ok'); $response = $svcRelayd->configtestAction(); $this->assertEquals($response['template'], 'OK'); $this->assertEquals($response['result'], 'configuration OK'); @@ -398,7 +398,7 @@ class RelaydTest extends \PHPUnit\Framework\TestCase // enable $_POST = array('relayd' => ['general' => ['enabled' => '1']]); $response = self::$setRelayd->setAction('general'); - $this->assertEquals($response['result'], 'ok'); + $this->assertEquals($response['status'], 'ok'); // reconfigure $response = $svcRelayd->reconfigureAction();