diff options
author | Kate Case <this.is@nathanielca.se> | 2022-08-22 15:03:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-22 15:03:19 -0400 |
commit | 7f79df30d5992e85b34b51fc42f857a7199dffb2 (patch) | |
tree | 420b580cf7b835c9c3df63af986ae9f66b836f49 | |
parent | e66c1e127c7226167e648d7778a7c2a71b71f58d (diff) | |
download | vyos.vyos-7f79df30d5992e85b34b51fc42f857a7199dffb2.tar.gz vyos.vyos-7f79df30d5992e85b34b51fc42f857a7199dffb2.zip |
Fix arguments-renamed errors (#268)
24 files changed, 26 insertions, 23 deletions
diff --git a/changelogs/fragments/renamed.yaml b/changelogs/fragments/renamed.yaml new file mode 100644 index 0000000..70e4644 --- /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 c575409..4281cba 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 5fc7e35..db39466 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 bdb29c0..465b249 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 820c6c4..a8a3569 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 3c49d3a..c282c71 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 b22a523..c0ef686 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 0e62be8..c691f09 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 2a9a81c..186edaa 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 80d0db5..c82ffc6 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 8c2fdfb..54377da 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 e0e4bfc..0e959c3 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 a0f5174..c796145 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 53dabdc..1db6c9b 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 cee1cfa..20b896d 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 9df41a5..c3631d9 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 ab38bf7..ec47461 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 60407ad..9b79ce6 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 17c605e..d11e5ab 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 613960f..6cac77d 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 00985c6..62bff19 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 d92efa2..5577d9c 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 c22f7c1..b763d9c 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 616ad09..427036b 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") |