Fix tests

arfeigin · Mar 21, 2024 · a07a928 · a07a928
1 parent ef82bd6
commit a07a928
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/tests/config_test.py b/tests/config_test.py
@@ -2103,13 +2103,13 @@ def test_add_loopback_with_invalid_name_adhoc_validation(self):
         print(result.exit_code)
         print(result.output)
         assert result.exit_code != 0
-        assert "Error: Loopbax1 is invalid, name should have prefix 'Loopback' and suffix '<0-999>' and 'loopback_name' should not exceed 11 characters" in result.output
+        assert "Error: Loopbax1 is invalid, name should have prefix 'Loopback' and suffix '<0-999>' and should not exceed 11 characters" in result.output
 
         result = runner.invoke(config.config.commands["loopback"].commands["add"], ["Loopback0000"], obj=obj)
         print(result.exit_code)
         print(result.output)
         assert result.exit_code != 0
-        assert "Error: Loopbax1 is invalid, name should have prefix 'Loopback' and suffix '<0-999>' and 'loopback_name' should not exceed 11 characters" in result.output
+        assert "Error: Loopbax1 is invalid, name should have prefix 'Loopback' and suffix '<0-999>' and should not exceed 11 characters" in result.output
 
     def test_del_nonexistent_loopback_adhoc_validation(self):
         config.ADHOC_VALIDATION = True

diff --git a/tests/portchannel_test.py b/tests/portchannel_test.py
@@ -46,13 +46,13 @@ def test_add_portchannel_with_invalid_name_adhoc_validation(self):
         print(result.exit_code)
         print(result.output)
         assert result.exit_code != 0
-        assert "Error: PortChan005 is invalid!, name should have prefix 'PortChannel' and suffix '<0-9999>', 'portchannel_name' should not exceed 15 characters" in result.output
+        assert "Error: PortChan005 is invalid!, name should have prefix 'PortChannel' and suffix '<0-9999>' and its length should not exceed 15 characters" in result.output
 
         result = runner.invoke(config.config.commands["portchannel"].commands["add"], ["PortChanl00000"], obj=obj)
         print(result.exit_code)
         print(result.output)
         assert result.exit_code != 0
-        assert "Error: PortChan005 is invalid!, name should have prefix 'PortChannel' and suffix '<0-9999>', 'portchannel_name' should not exceed 15 characters" in result.output
+        assert "Error: PortChan005 is invalid!, name should have prefix 'PortChannel' and suffix '<0-9999>' and its length should not exceed 15 characters" in result.output
 
     @patch("config.validated_config_db_connector.ValidatedConfigDBConnector.validated_set_entry", mock.Mock(side_effect=JsonPatchConflict))
     @patch("validated_config_db_connector.device_info.is_yang_config_validation_enabled", mock.Mock(return_value=True))

diff --git a/tests/subintf_test.py b/tests/subintf_test.py
@@ -60,22 +60,11 @@ def test_add_del_subintf_with_long_name(self):
         assert ('Ethernet0.102') in db.cfgdb.get_table('VLAN_SUB_INTERFACE')
         assert db.cfgdb.get_table('VLAN_SUB_INTERFACE')['Ethernet0.102']['admin_status'] == 'up'
 
-        result = runner.invoke(config.config.commands["subinterface"].commands["add"], ["PortChannel0004.104"], obj=obj)
-        print(result.exit_code, result.output)
-        assert result.exit_code == 0
-        assert ('PortChannel0004.104') in db.cfgdb.get_table('VLAN_SUB_INTERFACE')
-        assert db.cfgdb.get_table('VLAN_SUB_INTERFACE')['PortChannel0004.104']['admin_status'] == 'up'
-
         result = runner.invoke(config.config.commands["subinterface"].commands["del"], ["Ethernet0.102"], obj=obj)
         print(result.exit_code, result.output)
         assert result.exit_code == 0
         assert ('Ethernet0.102') not in db.cfgdb.get_table('VLAN_SUB_INTERFACE')
 
-        result = runner.invoke(config.config.commands["subinterface"].commands["del"], ["PortChannel0004.104"], obj=obj)
-        print(result.exit_code, result.output)
-        assert result.exit_code == 0
-        assert ('PortChannel0004.104') not in db.cfgdb.get_table('VLAN_SUB_INTERFACE')
-
 
     def test_add_existing_subintf_again(self):
         runner = CliRunner()

diff --git a/tests/vrf_test.py b/tests/vrf_test.py
@@ -269,7 +269,7 @@ def test_invalid_vrf_name(self):
         assert expected_output in result.output
 
         expected_output = """\
-Error: 'vrf_name' is too long! The 'vrf_name' length needs to be less than 16 characters
+Error: 'vrf_name' length should not exceed 16 characters
 """
         result = runner.invoke(config.config.commands["vrf"].commands["add"], ["VrfNameTooLong!!"], obj=obj)
         assert result.exit_code != 0