From 0b741dd8345dff666445dea2c3102a6be6048d92 Mon Sep 17 00:00:00 2001 From: YueGuobin Date: Tue, 17 Mar 2026 22:45:02 +0800 Subject: [PATCH] test: simplify class registration assertions in custom netmiko tests Refactored test assertions for Huawei CE, Ruijie, and VPCS telnet drivers to compare only class names instead of full module paths. This change reduces test brittleness when classes are imported via different module paths while maintaining validation of correct class registration in CLASS_MAPPER and CLASS_MAPPER_BASE. --- .../utils/custom_netmiko/tests/test_huawei_ce.py | 12 +++--------- .../utils/custom_netmiko/tests/test_ruijie_telnet.py | 12 +++--------- .../utils/custom_netmiko/tests/test_vpcs_telnet.py | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_huawei_ce.py b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_huawei_ce.py index f432dc1a4..db18bada4 100644 --- a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_huawei_ce.py +++ b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_huawei_ce.py @@ -52,19 +52,13 @@ class TestHuaweiTelnetCEDriver(unittest.TestCase): # Check CLASS_MAPPER self.assertIn("gns3_huawei_telnet_ce", CLASS_MAPPER) registered_class = CLASS_MAPPER["gns3_huawei_telnet_ce"] - # Compare by module+name since class may be imported via different paths - self.assertEqual( - (registered_class.__module__, registered_class.__name__), - (self.HuaweiTelnetCE.__module__, self.HuaweiTelnetCE.__name__) - ) + # Compare class name since class may be imported via different paths + self.assertEqual(registered_class.__name__, self.HuaweiTelnetCE.__name__) # Check CLASS_MAPPER_BASE self.assertIn("gns3_huawei_telnet_ce", CLASS_MAPPER_BASE) registered_class_base = CLASS_MAPPER_BASE["gns3_huawei_telnet_ce"] - self.assertEqual( - (registered_class_base.__module__, registered_class_base.__name__), - (self.HuaweiTelnetCE.__module__, self.HuaweiTelnetCE.__name__) - ) + self.assertEqual(registered_class_base.__name__, self.HuaweiTelnetCE.__name__) def test_inheritance_from_huawei_base(self): """Test that GNS3HuaweiTelnetCE inherits from HuaweiBase.""" diff --git a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_ruijie_telnet.py b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_ruijie_telnet.py index d9fa34f3c..b913f83ee 100644 --- a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_ruijie_telnet.py +++ b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_ruijie_telnet.py @@ -52,19 +52,13 @@ class TestRuijieTelnetEnhancedDriver(unittest.TestCase): # Check CLASS_MAPPER self.assertIn("gns3_ruijie_telnet", CLASS_MAPPER) registered_class = CLASS_MAPPER["gns3_ruijie_telnet"] - # Compare by module+name since class may be imported via different paths - self.assertEqual( - (registered_class.__module__, registered_class.__name__), - (self.RuijieTelnetEnhanced.__module__, self.RuijieTelnetEnhanced.__name__) - ) + # Compare class name since class may be imported via different paths + self.assertEqual(registered_class.__name__, self.RuijieTelnetEnhanced.__name__) # Check CLASS_MAPPER_BASE self.assertIn("gns3_ruijie_telnet", CLASS_MAPPER_BASE) registered_class_base = CLASS_MAPPER_BASE["gns3_ruijie_telnet"] - self.assertEqual( - (registered_class_base.__module__, registered_class_base.__name__), - (self.RuijieTelnetEnhanced.__module__, self.RuijieTelnetEnhanced.__name__) - ) + self.assertEqual(registered_class_base.__name__, self.RuijieTelnetEnhanced.__name__) def test_inheritance_from_ruijie_os_base(self): """Test that RuijieTelnetEnhanced inherits from RuijieOSBase.""" diff --git a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_vpcs_telnet.py b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_vpcs_telnet.py index b473c6ee8..95fa06b8c 100644 --- a/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_vpcs_telnet.py +++ b/gns3server/agent/gns3_copilot/utils/custom_netmiko/tests/test_vpcs_telnet.py @@ -54,19 +54,13 @@ class TestVPCSTelnetDriver(unittest.TestCase): # Check CLASS_MAPPER self.assertIn("gns3_vpcs_telnet", CLASS_MAPPER) registered_class = CLASS_MAPPER["gns3_vpcs_telnet"] - # Compare by module+name since class may be imported via different paths - self.assertEqual( - (registered_class.__module__, registered_class.__name__), - (self.VPCSTelnet.__module__, self.VPCSTelnet.__name__) - ) + # Compare class name since class may be imported via different paths + self.assertEqual(registered_class.__name__, self.VPCSTelnet.__name__) # Check CLASS_MAPPER_BASE self.assertIn("gns3_vpcs_telnet", CLASS_MAPPER_BASE) registered_class_base = CLASS_MAPPER_BASE["gns3_vpcs_telnet"] - self.assertEqual( - (registered_class_base.__module__, registered_class_base.__name__), - (self.VPCSTelnet.__module__, self.VPCSTelnet.__name__) - ) + self.assertEqual(registered_class_base.__name__, self.VPCSTelnet.__name__) def test_inheritance_from_base_connection(self): """Test that VPCSTelnet inherits from BaseConnection."""