ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python3 tests: Fix asserts.

Browse Source 
Use assert(Not)Equal()
Use assert{Greater,Less}[Equal]

Change-Id: I7c14570b8dce463ee13a67e9c1f10beb1a0308a8
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-11-24 23:19:53 -08:00
committed by Damjan Marion
parent 6221927e9b
commit 3d2df215bf
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_ip4.py
View File

@ -1147,8 +1147,8 @@ class TestIPPunt(VppTestCase):
# but not equal to the number sent, since some were policed
#
rx = self.pg1._get_capture(1)
self.assertTrue(len(rx) > 0)
self.assertTrue(len(rx) < len(pkts))
self.assertGreater(len(rx), 0)
self.assertLess(len(rx), len(pkts))
#
# remove the poilcer. back to full rx

4
test/test_ip6.py
View File

@ -1920,8 +1920,8 @@ class TestIP6Punt(VppTestCase):
# but not equal to the number sent, since some were policed
#
rx = self.pg1._get_capture(1)
self.assertTrue(len(rx) > 0)
self.assertTrue(len(rx) < len(pkts))
self.assertGreater(len(rx), 0)
self.assertLess(len(rx), len(pkts))
#
# remove the poilcer. back to full rx

8
test/test_nat.py
View File

@ -2111,7 +2111,7 @@ class TestNAT44(MethodHolder):
# general user and session dump verifications
users = self.vapi.nat44_user_dump()
self.assertTrue(len(users) >= 3)
self.assertGreaterEqual(len(users), 3)
addresses = self.vapi.nat44_address_dump()
self.assertEqual(len(addresses), 1)
for user in users:
@ -2127,7 +2127,7 @@ class TestNAT44(MethodHolder):
# pg4 session dump
sessions = self.vapi.nat44_user_session_dump(self.pg4.remote_ip4n, 10)
self.assertTrue(len(sessions) >= 4)
self.assertGreaterEqual(len(sessions), 4)
for session in sessions:
self.assertFalse(session.is_static)
self.assertEqual(session.inside_ip_address[0:4],
@ -2137,7 +2137,7 @@ class TestNAT44(MethodHolder):
# pg6 session dump
sessions = self.vapi.nat44_user_session_dump(self.pg6.remote_ip4n, 20)
self.assertTrue(len(sessions) >= 3)
self.assertGreaterEqual(len(sessions), 3)
for session in sessions:
self.assertTrue(session.is_static)
self.assertEqual(session.inside_ip_address[0:4],
@ -4146,7 +4146,7 @@ class TestNAT44EndpointDependent(MethodHolder):
server1_n += 1
else:
server2_n += 1
self.assertTrue(server1_n > server2_n)
self.assertGreater(server1_n, server2_n)
def test_static_lb_2(self):
""" NAT44 local service load balancing (asymmetrical rule) """

4
test/test_neighbor.py
View File

@ -1350,7 +1350,7 @@ class ARPTestCase(VppTestCase):
# how many we get is going to be dependent on the time for packet
# processing but it should be small
#
self.assertTrue(len(rx) < 64)
self.assertLess(len(rx), 64)
#
# IPv6/ND
@ -1378,7 +1378,7 @@ class ARPTestCase(VppTestCase):
# how many we get is going to be dependent on the time for packet
# processing but it should be small
#
self.assertTrue(len(rx) < 64)
self.assertLess(len(rx), 64)
class NeighborStatsTestCase(VppTestCase):

6
test/test_sixrd.py
View File

@ -72,9 +72,9 @@ class Test6RD(VppTestCase):
if IP in rx:
self.fail()
self.assertTrue(rx[IPv6].src == expected[IPv6].src)
self.assertTrue(rx[IPv6].dst == expected[IPv6].dst)
self.assertTrue(rx[IPv6].nh == expected[IPv6].nh)
self.assertEqual(rx[IPv6].src, expected[IPv6].src)
self.assertEqual(rx[IPv6].dst, expected[IPv6].dst)
self.assertEqual(rx[IPv6].nh, expected[IPv6].nh)
def payload(self, len):
return 'x' * len