gbp: More reliable unit-tests

Type: fix

the GBP unit tests would peridocially fail. The reason being that there
is dynamic state whose presence nneds to be created, tested and then
timeed out. The failures occurded when the timeout occured before the
state could be tested. the previous timeout was 2 seconds, this has been
doubled, as a result i saw no faliures running continuously for ~16
hours.
bumping the timer increasing the test run time from ~40 to ~53 seconds,
a small price to pay.

in test cases where the state is not timed out i bumped the timer to 60
seconds.

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I11b0970570caa8eebf486fe8cd8e44a4b2b1fc36

diff --git a/src/plugins/gbp/test/test_gbp.py b/src/plugins/gbp/test/test_gbp.py
index f306769..e950a5a 100644 (file)
--- a/src/plugins/gbp/test/test_gbp.py
+++ b/src/plugins/gbp/test/test_gbp.py
@@ -1578,13 +1578,13 @@ class TestGBP(VppTestCase):
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_220.add_vpp_config()
         epg_330 = VppGbpEndpointGroup(self, 330, 113, rd1, gbd1,
                                       None, self.loop1,
                                       "10.0.1.128",
                                       "2001:11::128",
         epg_220.add_vpp_config()
         epg_330 = VppGbpEndpointGroup(self, 330, 113, rd1, gbd1,
                                       None, self.loop1,
                                       "10.0.1.128",
                                       "2001:11::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_330.add_vpp_config()
 
         #
         epg_330.add_vpp_config()
 
         #


@@ -2457,7 +2457,7 @@ class TestGBP(VppTestCase):
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(3))

         epg_220.add_vpp_config()
 
         ep = VppGbpEndpoint(self, self.pg0,
         epg_220.add_vpp_config()
 
         ep = VppGbpEndpoint(self, self.pg0,


@@ -2631,7 +2631,7 @@ class TestGBP(VppTestCase):
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_220.add_vpp_config()
 
         #
         epg_220.add_vpp_config()
 
         #


@@ -2807,7 +2807,7 @@ class TestGBP(VppTestCase):
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, self.loop0,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_220.add_vpp_config()
 
         #
         epg_220.add_vpp_config()
 
         #


@@ -3309,19 +3309,19 @@ class TestGBP(VppTestCase):
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_220.add_vpp_config()
         epg_221 = VppGbpEndpointGroup(self, 221, 441, rd1, gbd2,
                                       None, gbd2.bvi,
                                       "10.0.1.128",
                                       "2001:11::128",
         epg_220.add_vpp_config()
         epg_221 = VppGbpEndpointGroup(self, 221, 441, rd1, gbd2,
                                       None, gbd2.bvi,
                                       "10.0.1.128",
                                       "2001:11::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_221.add_vpp_config()
         epg_222 = VppGbpEndpointGroup(self, 222, 442, rd1, gbd1,
                                       None, gbd1.bvi,
                                       "10.0.2.128",
                                       "2001:12::128",
         epg_221.add_vpp_config()
         epg_222 = VppGbpEndpointGroup(self, 222, 442, rd1, gbd1,
                                       None, gbd1.bvi,
                                       "10.0.2.128",
                                       "2001:12::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_222.add_vpp_config()
 
         #
         epg_222.add_vpp_config()
 
         #


@@ -3352,13 +3352,13 @@ class TestGBP(VppTestCase):
                                       None, gbd1.bvi,
                                       "12.0.0.128",
                                       "4001:10::128",
                                       None, gbd1.bvi,
                                       "12.0.0.128",
                                       "4001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_320.add_vpp_config()
         epg_321 = VppGbpEndpointGroup(self, 321, 551, rd1, gbd4,
                                       None, gbd2.bvi,
                                       "12.0.1.128",
                                       "4001:11::128",
         epg_320.add_vpp_config()
         epg_321 = VppGbpEndpointGroup(self, 321, 551, rd1, gbd4,
                                       None, gbd2.bvi,
                                       "12.0.1.128",
                                       "4001:11::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_321.add_vpp_config()
 
         #
         epg_321.add_vpp_config()
 
         #


@@ -3870,7 +3870,7 @@ class TestGBP(VppTestCase):
                                    None, gebd.bvi,
                                    "10.1.0.128",
                                    "2001:10:1::128",
                                    None, gebd.bvi,
                                    "10.1.0.128",
                                    "2001:10:1::128",

-                                   VppGbpEndpointRetention(2))
+                                   VppGbpEndpointRetention(60))

         eepg.add_vpp_config()
         # add subnets to BVI
         VppIpInterfaceAddress(
         eepg.add_vpp_config()
         # add subnets to BVI
         VppIpInterfaceAddress(


@@ -4232,13 +4232,13 @@ class TestGBP(VppTestCase):
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_220.add_vpp_config()
         epg_221 = VppGbpEndpointGroup(self, 221, 441, rd1, gbd2,
                                       None, gbd2.bvi,
                                       "10.0.1.128",
                                       "2001:11::128",
         epg_220.add_vpp_config()
         epg_221 = VppGbpEndpointGroup(self, 221, 441, rd1, gbd2,
                                       None, gbd2.bvi,
                                       "10.0.1.128",
                                       "2001:11::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_221.add_vpp_config()
 
         #
         epg_221.add_vpp_config()
 
         #


@@ -4273,7 +4273,7 @@ class TestGBP(VppTestCase):
                                       None, gbd3.bvi,
                                       "12.0.0.128",
                                       "4001:10::128",
                                       None, gbd3.bvi,
                                       "12.0.0.128",
                                       "4001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(60))

         epg_320.add_vpp_config()
 
         #
         epg_320.add_vpp_config()
 
         #


@@ -4649,7 +4649,7 @@ class TestGBP(VppTestCase):
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_220.add_vpp_config()
 
         # the BVIs have the subnets applied ...
         epg_220.add_vpp_config()
 
         # the BVIs have the subnets applied ...


@@ -5427,7 +5427,7 @@ class TestGBP(VppTestCase):
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",
                                       None, gbd1.bvi,
                                       "10.0.0.128",
                                       "2001:10::128",

-                                      VppGbpEndpointRetention(2))
+                                      VppGbpEndpointRetention(4))

         epg_220.add_vpp_config()
 
         # the BVIs have the subnet applied ...
         epg_220.add_vpp_config()
 
         # the BVIs have the subnet applied ...