upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-03 20:39:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed plist and two tests

Browse source
This commit is contained in:
Monviech 2025-11-26 16:34:52 +01:00
parent 7dabb44610
commit 067108a37f
3 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plist
View file

@ -1056,6 +1056,14 @@
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest/config.xml /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest/config.xml
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Dnsmasq/FieldTypes/HostnameFieldTest.php /usr/local/opnsense/mvc/tests/app/models/OPNsense/Dnsmasq/FieldTypes/HostnameFieldTest.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/Base/JsonSampleTestCase.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/KeaCtrlAgentTest.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/KeaDhcpv4Test.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/KeaDhcpv6Test.php
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/Snapshots/KeaCtrlAgentTest.json
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/Snapshots/KeaDhcpv4Test.json
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/Snapshots/KeaDhcpv6Test.json
/usr/local/opnsense/mvc/tests/app/models/OPNsense/Kea/Snapshots/config.xml
/usr/local/opnsense/mvc/tests/phpunit.xml /usr/local/opnsense/mvc/tests/phpunit.xml
/usr/local/opnsense/mvc/tests/setup.php /usr/local/opnsense/mvc/tests/setup.php
/usr/local/opnsense/scripts/auth/add_user.php /usr/local/opnsense/scripts/auth/add_user.php

15
src/opnsense/mvc/tests/app/models/OPNsense/Kea/KeaDhcpv4Test.php
View file

@ -92,25 +92,16 @@ class KeaDhcpv4Test extends JsonSampleTestCase
public function testPhysicalInterfacesParsing(): void public function testPhysicalInterfacesParsing(): void
{ {
$xml = <<<XML // config.xml already loaded by JsonSampleTestCase::loadSnapshotConfig()
<opnsense>
<interfaces>
<lan><if>igc0</if></lan>
<wan><if>igc1</if></wan>
</interfaces>
</opnsense>
XML;
\OPNsense\Core\Config::getInstance()->setXml($xml);
$m = $this->getModelInstance(); $m = $this->getModelInstance();
$m->general->interfaces = "lan,wan"; $m->general->interfaces = "lan,opt1";
$ifs = (new \ReflectionClass($m)) $ifs = (new \ReflectionClass($m))
->getMethod('getConfigPhysicalInterfaces') ->getMethod('getConfigPhysicalInterfaces')
->invoke($m); ->invoke($m);
$this->assertSame(['igc0','igc1'], $ifs); $this->assertSame(['igc0','igc2'], $ifs);
} }
} }

15
src/opnsense/mvc/tests/app/models/OPNsense/Kea/KeaDhcpv6Test.php
View file

@ -92,24 +92,15 @@ class KeaDhcpv6Test extends JsonSampleTestCase
public function testPhysicalInterfacesParsing(): void public function testPhysicalInterfacesParsing(): void
{ {
$xml = <<<XML // config.xml already loaded by JsonSampleTestCase::loadSnapshotConfig()
<opnsense>
<interfaces>
<lan><if>igc0</if></lan>
<wan><if>igc1</if></wan>
</interfaces>
</opnsense>
XML;
\OPNsense\Core\Config::getInstance()->setXml($xml);
$m = $this->getModelInstance(); $m = $this->getModelInstance();
$m->general->interfaces = "lan,wan"; $m->general->interfaces = "lan,opt1";
$ifs = (new \ReflectionClass($m)) $ifs = (new \ReflectionClass($m))
->getMethod('getConfigPhysicalInterfaces') ->getMethod('getConfigPhysicalInterfaces')
->invoke($m); ->invoke($m);
$this->assertSame(['igc0','igc1'], $ifs); $this->assertSame(['igc0','igc2'], $ifs);
} }
} }