diff --git a/tests/test_copp.py b/tests/test_copp.py index 59cf8b4c3fbf..567120a63601 100644 --- a/tests/test_copp.py +++ b/tests/test_copp.py @@ -1,6 +1,5 @@ import time import os -import pytest from swsscommon import swsscommon @@ -299,7 +298,6 @@ def validate_trap_group(self, trap_oid, trap_group): if fv[0] == "SAI_HOSTIF_ATTR_NAME": assert fv[1] == trap_group[keys] - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_defaults(self, dvs, testlog): self.setup_copp(dvs) trap_keys = self.trap_atbl.getKeys() @@ -323,7 +321,6 @@ def test_defaults(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_restricted_trap_sflow(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("state", "enabled")]) @@ -352,7 +349,6 @@ def test_restricted_trap_sflow(self, dvs, testlog): assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_policer_set(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("cbs", "900")]) @@ -384,7 +380,6 @@ def test_policer_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_trap_group_set(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -414,7 +409,6 @@ def test_trap_group_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_trap_ids_set(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -470,7 +464,6 @@ def test_trap_ids_set(self, dvs, testlog): break assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_trap_action_set(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("trap_action", "copy")]) @@ -502,7 +495,6 @@ def test_trap_action_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_new_trap_add(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -532,7 +524,6 @@ def test_new_trap_add(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_new_trap_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -564,7 +555,6 @@ def test_new_trap_del(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == False - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_new_trap_group_add(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -599,7 +589,6 @@ def test_new_trap_group_add(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_new_trap_group_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -636,7 +625,6 @@ def test_new_trap_group_del(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found != True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_override_trap_grp_cfg_del (self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -672,7 +660,6 @@ def test_override_trap_grp_cfg_del (self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_override_trap_cfg_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -706,7 +693,6 @@ def test_override_trap_cfg_del(self, dvs, testlog): elif trap_id == "ssh": assert trap_found == False - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") def test_empty_trap_cfg(self, dvs, testlog): self.setup_copp(dvs) global copp_trap