diff options
24 files changed, 26 insertions, 23 deletions
diff --git a/changelogs/fragments/renamed.yaml b/changelogs/fragments/renamed.yaml new file mode 100644 index 00000000..70e46444 --- /dev/null +++ b/changelogs/fragments/renamed.yaml @@ -0,0 +1,3 @@ +--- +trivial: + - Fix arguments-renamed errors in tests. diff --git a/tests/unit/modules/network/vyos/test_vyos_banner.py b/tests/unit/modules/network/vyos/test_vyos_banner.py index c575409c..4281cba6 100644 --- a/tests/unit/modules/network/vyos/test_vyos_banner.py +++ b/tests/unit/modules/network/vyos/test_vyos_banner.py @@ -48,7 +48,7 @@ class TestVyosBannerModule(TestVyosModule): self.mock_get_config.stop() self.mock_load_config.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): self.load_config.return_value = dict(diff=None, session="session") def test_vyos_banner_create(self): diff --git a/tests/unit/modules/network/vyos/test_vyos_bgp_address_family.py b/tests/unit/modules/network/vyos/test_vyos_bgp_address_family.py index 5fc7e358..db39466d 100644 --- a/tests/unit/modules/network/vyos/test_vyos_bgp_address_family.py +++ b/tests/unit/modules/network/vyos/test_vyos_bgp_address_family.py @@ -54,7 +54,7 @@ class TestVyosBgpafModule(TestVyosModule): self.mock_get_resource_connection_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_bgp_address_family_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_bgp_global.py b/tests/unit/modules/network/vyos/test_vyos_bgp_global.py index bdb29c0f..465b249c 100644 --- a/tests/unit/modules/network/vyos/test_vyos_bgp_global.py +++ b/tests/unit/modules/network/vyos/test_vyos_bgp_global.py @@ -69,7 +69,7 @@ class TestVyosBgpglobalModule(TestVyosModule): self.mock_execute_show_command.stop() self.mock_execute_show_command_config.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_bgp_global_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_command.py b/tests/unit/modules/network/vyos/test_vyos_command.py index 820c6c44..a8a35695 100644 --- a/tests/unit/modules/network/vyos/test_vyos_command.py +++ b/tests/unit/modules/network/vyos/test_vyos_command.py @@ -43,7 +43,7 @@ class TestVyosCommandModule(TestVyosModule): super(TestVyosCommandModule, self).tearDown() self.mock_run_commands.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): module, commands = args output = list() diff --git a/tests/unit/modules/network/vyos/test_vyos_config.py b/tests/unit/modules/network/vyos/test_vyos_config.py index 3c49d3aa..c282c710 100644 --- a/tests/unit/modules/network/vyos/test_vyos_config.py +++ b/tests/unit/modules/network/vyos/test_vyos_config.py @@ -75,7 +75,7 @@ class TestVyosConfigModule(TestVyosModule): self.mock_run_commands.stop() self.mock_get_connection.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): config_file = "vyos_config_config.cfg" self.get_config.return_value = load_fixture(config_file) self.load_config.return_value = None diff --git a/tests/unit/modules/network/vyos/test_vyos_facts.py b/tests/unit/modules/network/vyos/test_vyos_facts.py index b22a5232..c0ef686d 100644 --- a/tests/unit/modules/network/vyos/test_vyos_facts.py +++ b/tests/unit/modules/network/vyos/test_vyos_facts.py @@ -64,7 +64,7 @@ class TestVyosFactsModule(TestVyosModule): self.mock_get_capabilities.stop() self.mock_get_resource_connection.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): module, commands = args output = list() diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_global.py b/tests/unit/modules/network/vyos/test_vyos_firewall_global.py index 0e62be89..c691f09f 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_global.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_global.py @@ -72,7 +72,7 @@ class TestVyosFirewallRulesModule(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): return load_fixture("vyos_firewall_global_config.cfg") diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_interfaces.py b/tests/unit/modules/network/vyos/test_vyos_firewall_interfaces.py index 2a9a81c6..186edaa6 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_interfaces.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_interfaces.py @@ -74,7 +74,7 @@ class TestVyosFirewallInterfacesModule(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): return load_fixture("vyos_firewall_interfaces_config.cfg") diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py index 80d0db56..c82ffc6f 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py @@ -81,7 +81,7 @@ class TestVyosFirewallRulesModule(TestVyosModule): self.mock_execute_show_command.stop() self.mock_get_os_version.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): return load_fixture("vyos_firewall_rules_config.cfg") diff --git a/tests/unit/modules/network/vyos/test_vyos_hostname.py b/tests/unit/modules/network/vyos/test_vyos_hostname.py index 8c2fdfb8..54377da2 100644 --- a/tests/unit/modules/network/vyos/test_vyos_hostname.py +++ b/tests/unit/modules/network/vyos/test_vyos_hostname.py @@ -61,7 +61,7 @@ class TestVyosHostnameModule(TestVyosModule): self.mock_get_resource_connection_facts.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_hostname_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_interface.py b/tests/unit/modules/network/vyos/test_vyos_interface.py index e0e4bfc7..0e959c3a 100644 --- a/tests/unit/modules/network/vyos/test_vyos_interface.py +++ b/tests/unit/modules/network/vyos/test_vyos_interface.py @@ -86,7 +86,7 @@ class TestVyosInterfaceModule(TestVyosModule): self.mock_execute_lldp_command.stop() self.mock_execute_interfaces_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): self.get_config.return_value = load_fixture( "vyos_interface_config.cfg" ) diff --git a/tests/unit/modules/network/vyos/test_vyos_interfaces.py b/tests/unit/modules/network/vyos/test_vyos_interfaces.py index a0f51743..c7961452 100644 --- a/tests/unit/modules/network/vyos/test_vyos_interfaces.py +++ b/tests/unit/modules/network/vyos/test_vyos_interfaces.py @@ -74,7 +74,7 @@ class TestVyosFirewallInterfacesModule(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): return load_fixture("vyos_interfaces_config.cfg") diff --git a/tests/unit/modules/network/vyos/test_vyos_ntp_global.py b/tests/unit/modules/network/vyos/test_vyos_ntp_global.py index 53dabdcd..1db6c9b2 100644 --- a/tests/unit/modules/network/vyos/test_vyos_ntp_global.py +++ b/tests/unit/modules/network/vyos/test_vyos_ntp_global.py @@ -61,7 +61,7 @@ class TestVyosNTPModule(TestVyosModule): self.mock_get_resource_connection_facts.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_ntp_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_ospf_interfaces.py b/tests/unit/modules/network/vyos/test_vyos_ospf_interfaces.py index cee1cfaa..20b896d3 100644 --- a/tests/unit/modules/network/vyos/test_vyos_ospf_interfaces.py +++ b/tests/unit/modules/network/vyos/test_vyos_ospf_interfaces.py @@ -51,7 +51,7 @@ class TestVyosOspfInterfacesModule(TestVyosModule): self.mock_get_resource_connection_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_ospf_interfaces_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_ospfv2.py b/tests/unit/modules/network/vyos/test_vyos_ospfv2.py index 9df41a55..c3631d9c 100644 --- a/tests/unit/modules/network/vyos/test_vyos_ospfv2.py +++ b/tests/unit/modules/network/vyos/test_vyos_ospfv2.py @@ -72,7 +72,7 @@ class TestVyosOspfv2Module(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_ospfv2_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_ospfv3.py b/tests/unit/modules/network/vyos/test_vyos_ospfv3.py index ab38bf76..ec474619 100644 --- a/tests/unit/modules/network/vyos/test_vyos_ospfv3.py +++ b/tests/unit/modules/network/vyos/test_vyos_ospfv3.py @@ -72,7 +72,7 @@ class TestVyosOspfv3Module(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_ospfv3_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_ping.py b/tests/unit/modules/network/vyos/test_vyos_ping.py index 60407ad6..9b79ce63 100644 --- a/tests/unit/modules/network/vyos/test_vyos_ping.py +++ b/tests/unit/modules/network/vyos/test_vyos_ping.py @@ -43,7 +43,7 @@ class TestVyosPingModule(TestVyosModule): super(TestVyosPingModule, self).tearDown() self.mock_run_commands.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): commands = kwargs["commands"] output = list() diff --git a/tests/unit/modules/network/vyos/test_vyos_route_maps.py b/tests/unit/modules/network/vyos/test_vyos_route_maps.py index 17c605ed..d11e5abc 100644 --- a/tests/unit/modules/network/vyos/test_vyos_route_maps.py +++ b/tests/unit/modules/network/vyos/test_vyos_route_maps.py @@ -61,7 +61,7 @@ class TestVyosRouteMapsModule(TestVyosModule): self.mock_get_resource_connection_facts.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_route_maps_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_snmp_server.py b/tests/unit/modules/network/vyos/test_vyos_snmp_server.py index 613960f6..6cac77d3 100644 --- a/tests/unit/modules/network/vyos/test_vyos_snmp_server.py +++ b/tests/unit/modules/network/vyos/test_vyos_snmp_server.py @@ -61,7 +61,7 @@ class TestVyosSnmpServerModule(TestVyosModule): self.mock_get_resource_connection_facts.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): if filename is None: filename = "vyos_snmp_server_config.cfg" diff --git a/tests/unit/modules/network/vyos/test_vyos_static_route.py b/tests/unit/modules/network/vyos/test_vyos_static_route.py index 00985c6a..62bff19a 100644 --- a/tests/unit/modules/network/vyos/test_vyos_static_route.py +++ b/tests/unit/modules/network/vyos/test_vyos_static_route.py @@ -52,7 +52,7 @@ class TestVyosStaticRouteModule(TestVyosModule): self.mock_get_config.stop() self.mock_load_config.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): self.get_config.return_value = "" self.load_config.return_value = dict(diff=None, session="session") diff --git a/tests/unit/modules/network/vyos/test_vyos_static_routes.py b/tests/unit/modules/network/vyos/test_vyos_static_routes.py index d92efa26..5577d9ce 100644 --- a/tests/unit/modules/network/vyos/test_vyos_static_routes.py +++ b/tests/unit/modules/network/vyos/test_vyos_static_routes.py @@ -71,7 +71,7 @@ class TestVyosStaticRoutesModule(TestVyosModule): self.mock_load_config.stop() self.mock_execute_show_command.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): def load_from_file(*args, **kwargs): return load_fixture("vyos_static_routes_config.cfg") diff --git a/tests/unit/modules/network/vyos/test_vyos_system.py b/tests/unit/modules/network/vyos/test_vyos_system.py index c22f7c18..b763d9ca 100644 --- a/tests/unit/modules/network/vyos/test_vyos_system.py +++ b/tests/unit/modules/network/vyos/test_vyos_system.py @@ -51,7 +51,7 @@ class TestVyosSystemModule(TestVyosModule): self.mock_get_config.stop() self.mock_load_config.stop() - def load_fixtures(self, commands=None): + def load_fixtures(self, commands=None, filename=None): self.get_config.return_value = load_fixture("vyos_config_config.cfg") def test_vyos_system_hostname(self): diff --git a/tests/unit/modules/network/vyos/test_vyos_user.py b/tests/unit/modules/network/vyos/test_vyos_user.py index 616ad095..427036b5 100644 --- a/tests/unit/modules/network/vyos/test_vyos_user.py +++ b/tests/unit/modules/network/vyos/test_vyos_user.py @@ -50,7 +50,7 @@ class TestVyosUserModule(TestVyosModule): self.mock_get_config.stop() self.mock_load_config.stop() - def load_fixtures(self, commands=None, transport="cli", filename=None): + def load_fixtures(self, commands=None, filename=None): self.get_config.return_value = load_fixture("vyos_user_config.cfg") self.load_config.return_value = dict(diff=None, session="session") |