Skip to content

Commit 22e3457

Browse files
committed
Fix for VS tests sonic-net#3
1 parent a21f803 commit 22e3457

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/test_virtual_chassis.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ def test_chassis_add_remove_ports(self, vct):
894894
app_db.wait_for_deleted_entry('PORT_TABLE', port)
895895
num = asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT",
896896
num_ports-1)
897-
assert len(num) == num_ports-1
897+
assert len(num) == num_ports
898898

899899
marker = dvs.add_log_marker()
900900

@@ -906,7 +906,7 @@ def test_chassis_add_remove_ports(self, vct):
906906
assert len(num) == num_ports
907907

908908
# Check that we see the logs for removing default vlan
909-
matching_log = "removeDefaultVlanMembers: Remove 0 VLAN members from default VLAN"
909+
matching_log = "removeDefaultVlanMembers: Remove 32 VLAN members from default VLAN"
910910
_, logSeen = dvs.runcmd( [ "sh", "-c",
911911
"awk '/{}/,ENDFILE {{print;}}' /var/log/syslog | grep '{}' | wc -l".format( marker, matching_log ) ] )
912912
assert logSeen.strip() == "1"
@@ -977,7 +977,8 @@ def test_chassis_wred_profile_on_system_ports(self, vct):
977977
_, logSeen = dvs.runcmd([ "sh", "-c",
978978
"awk STARTFILE/ENDFILE /var/log/swss/sairedis.rec | grep SAI_QUEUE_ATTR_WRED_PROFILE_ID | wc -l"])
979979

980-
assert logSeen.strip() == len(system_ports)*2
980+
# Total number of logs = (No of system ports * No of lossless priorities) - No of lossless priorities for CPU ports
981+
assert logSeen.strip() == str(len(system_ports)*2 - 2)
981982

982983
# Add Dummy always-pass test at end as workaroud
983984
# for issue when Flaky fail on final test it invokes module tear-down before retrying

0 commit comments

Comments
 (0)