tests: make tests less make dependent

[vpp.git] / test / test_igmp.py

diff --git a/test/test_igmp.py b/test/test_igmp.py
index 68a3e4e..f99bdb2 100644 (file)
--- a/test/test_igmp.py
+++ b/test/test_igmp.py
@@ -1,12 +1,14 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
-from scapy.layers.l2 import Ether, Raw
+from scapy.layers.l2 import Ether
+from scapy.packet import Raw
 from scapy.layers.inet import IP, IPOption
 from scapy.contrib.igmpv3 import IGMPv3, IGMPv3gr, IGMPv3mq, IGMPv3mr
 
-from framework import VppTestCase, VppTestRunner, running_extended_tests
+from framework import tag_fixme_vpp_workers
+from framework import VppTestCase, VppTestRunner
 from vpp_igmp import find_igmp_state, IGMP_FILTER, IgmpRecord, IGMP_MODE, \
     IgmpSG, VppHostState, wait_for_igmp_event
 from vpp_ip_route import find_mroute, VppIpTable
@@ -17,6 +19,7 @@ class IgmpMode:
     ROUTER = 0
 
 
+@tag_fixme_vpp_workers
 class TestIgmp(VppTestCase):
     """ IGMP Test Case """
 
@@ -89,10 +92,10 @@ class TestIgmp(VppTestCase):
         self.vapi.igmp_enable_disable(self.pg2.sw_if_index, 0, IGMP_MODE.HOST)
         self.vapi.igmp_enable_disable(self.pg3.sw_if_index, 0, IGMP_MODE.HOST)
 
-        self.assertFalse(find_mroute(self, "224.0.0.1", "0.0.0.0", 32))
+        self.assertTrue(find_mroute(self, "224.0.0.1", "0.0.0.0", 32))
         self.assertFalse(find_mroute(self, "224.0.0.22", "0.0.0.0", 32))
-        self.assertFalse(find_mroute(self, "224.0.0.1", "0.0.0.0", 32,
-                                     table_id=1))
+        self.assertTrue(find_mroute(self, "224.0.0.1", "0.0.0.0", 32,
+                                    table_id=1))
         self.assertFalse(find_mroute(self, "224.0.0.22", "0.0.0.0", 32,
                                      table_id=1))
 
@@ -202,7 +205,7 @@ class TestIgmp(VppTestCase):
                IP(src=self.pg0.remote_ip4, dst='224.0.0.1', tos=0xc0) /
                IGMPv3(type="Membership Query", mrcode=100) /
                IGMPv3mq(gaddr="0.0.0.0") /
-               Raw('\x00' * 10))
+               Raw(b'\x00' * 10))
 
         self.send(self.pg0, p_g)
 
@@ -469,6 +472,8 @@ class TestIgmp(VppTestCase):
         h10.add_vpp_config()
 
         capture = self.pg0.get_capture(2, timeout=10)
+        # wait for a little bit
+        self.sleep(1)
 
         #
         # remove state, expect the report for the removal