From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 3/4] tests: mocking more functions to avoid access to system files
Date: Tue, 5 Dec 2023 14:12:09 +0100 [thread overview]
Message-ID: <20231205131209.1813439-5-s.lendl@proxmox.com> (raw)
In-Reply-To: <20231205131209.1813439-2-s.lendl@proxmox.com>
previously extracted functions are now mocked in the zone tests
mocked PVE::Network::SDN::Controllers::read_etc_network_interfaces and also
INotify::read_etc_network_interfaces to return the same $interfaces_config
created a mock for several PVE::Network::SDN::Controllers::<type>Plugin methods
that would require system access. Just to be sure.
Added a note that mocking INotify::read_file is a HACK and not garanteed to work
if anything other than /etc/network/interfaces is read.
Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
src/test/run_test_zones.pl | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
index ce8edc2..2d9be88 100755
--- a/src/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
@@ -14,6 +14,10 @@ use PVE::Network::SDN::Zones;
use PVE::Network::SDN::Controllers;
use PVE::INotify;
+use Data::Dumper qw(Dumper);
+$Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 1;
+
sub read_sdn_config {
my ($file) = @_;
@@ -29,7 +33,6 @@ sub read_sdn_config {
return $sdn_config;
}
-
my @tests = grep { -d } glob './zones/*/*';
foreach my $test (@tests) {
@@ -47,8 +50,20 @@ foreach my $test (@tests) {
return 'localhost';
},
read_file => sub {
+ # HACK this assumes we are always calling PVE::INotify::read_file('interfaces');
return $interfaces_config;
},
+ read_etc_network_interfaces => sub {
+ return $interfaces_config;
+ },
+ );
+
+ my $mocked_pve_sdn_controllers;
+ $mocked_pve_sdn_controllers = Test::MockModule->new('PVE::Network::SDN::Controllers');
+ $mocked_pve_sdn_controllers->mock(
+ read_etc_network_interfaces => sub {
+ return $interfaces_config;
+ }
);
my $pve_sdn_subnets;
@@ -88,6 +103,25 @@ foreach my $test (@tests) {
},
);
+ my ($first_plugin) = %{$sdn_config->{controllers}->{ids}} if defined $sdn_config->{controllers};
+ if ($first_plugin) {
+ my $controller_plugin = PVE::Network::SDN::Controllers::Plugin->lookup(
+ $sdn_config->{controllers}->{ids}->{$first_plugin}->{type}
+ );
+ my $mocked_controller_plugin = Test::MockModule->new($controller_plugin);
+ $mocked_controller_plugin->mock(
+ write_controller_config => sub {
+ return;
+ },
+ reload_controller => sub {
+ return;
+ },
+ read_local_frr_config => sub {
+ return;
+ },
+ );
+ }
+
my $name = $test;
my $expected = read_file("./$test/expected_sdn_interfaces");
--
2.42.0
next prev parent reply other threads:[~2023-12-05 13:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 13:12 [pve-devel] [PATCH pve-network 0/4] SDN tests in sbuild Stefan Lendl
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 1/4] refactor(controllers): extract read_etc_network_interfaces Stefan Lendl
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 2/4] refactor(evpn): extract read_local_frr_config Stefan Lendl
2023-12-05 13:12 ` Stefan Lendl [this message]
2023-12-05 13:18 ` [pve-devel] [PATCH pve-network 3/4] tests: mocking more functions to avoid access to system files Lukas Wagner
2023-12-05 14:55 ` Stefan Lendl
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 4/4] tests: run tests in sbuild Stefan Lendl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205131209.1813439-5-s.lendl@proxmox.com \
--to=s.lendl@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.