X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_udp.py;h=3010a1dd7e14f13b188a1d976a4ac6c60c70ac92;hb=8feeaff56;hp=e04d7beaf06a74d6b29ca557a249768d1a1a688a;hpb=9c0a3c423ee0b9326f600a00c1bd46fef45d4975;p=vpp.git diff --git a/test/test_udp.py b/test/test_udp.py index e04d7beaf06..3010a1dd7e1 100644 --- a/test/test_udp.py +++ b/test/test_udp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import unittest from framework import VppTestCase, VppTestRunner -from vpp_udp_encap import * +from vpp_udp_encap import find_udp_encap, VppUdpEncap from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, VppMplsLabel from scapy.packet import Raw @@ -85,7 +85,7 @@ class TestUdpEncap(VppTestCase): # # construct a UDP encap object through each of the peers - # v4 through the first two peears, v6 through the second. + # v4 through the first two peers, v6 through the second. # udp_encap_0 = VppUdpEncap(self, self.pg0.local_ip4, @@ -259,10 +259,10 @@ class TestUDP(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", - sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add(namespace_id="1", - sw_if_index=self.loop1.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id="0", + sw_if_index=self.loop0.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id="1", + sw_if_index=self.loop1.sw_if_index) def tearDown(self): for i in self.lo_interfaces: @@ -293,14 +293,14 @@ class TestUDP(VppTestCase): "uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) error = self.vapi.cli("test echo client mbytes 10 appns 1 " + "fifo-size 4 no-output test-bytes " + "syn-timeout 2 no-return uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) # Delete inter-table routes ip_t01.remove_vpp_config()