This fixes the change from https://gerrit.fd.io/r/#/c/16175/
...
======
Totals
======
Ran: 856 tests in 2123.0000 sec.
- Passed: 667
- Skipped: 157
- Expected Fail: 0
- Unexpected Success: 0
- Failed: 32
Sum of execute time for each test: 1641.0832 sec.
==============
Worker Balance
==============
- Worker 0 (416 tests) => 0:35:06.788054
- Worker 1 (440 tests) => 0:31:13.814911
Test id Runtime (s)
-------------------------------------------------------------------------------------- -----------
test.test_vcl.VCLCutThruTestCase.test_ldp_cut_thru_bi_dir_nsock 120.382
test.test_vcl.VCLThruHostStackGroupBTestCase.test_ldp_thru_host_stack_bi_dir_nsock 60.368
test.test_vcl.VCLIpv6ThruHostStackGroupBTestCase.test_ldp_thru_host_stack_bi_dir_nsock 60.356
test.test_igmp.TestIgmp.test_igmp_host 47.411
test.test_reassembly.TestFIFReassembly.test_fif6 38.561
test.test_reassembly.TestFIFReassembly.test_fif4 37.045
test.test_gbp.TestGBP.test_gbp 30.041
test.test_dhcp.TestDHCP.test_dhcp_proxy 29.339
test.test_vcl.VCLCutThruTestCase.test_ldp_cut_thru_iperf3 20.489
test.test_neighbor.ARPTestCase.test_arp 19.004
Change-Id: Ic1565f14962f157d5041230de3aeeab0b85f21e1
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
from multiprocessing import Process, Pipe
from pickle import dumps
from multiprocessing import Process, Pipe
from pickle import dumps
from framework import VppTestCase
from framework import VppTestCase
self._pipe = Pipe() # pipe for input/output arguments
def __repr__(self):
self._pipe = Pipe() # pipe for input/output arguments
def __repr__(self):
- return six.reprlib(RemoteClassAttr(self, None))
+ return moves.reprlib.repr(RemoteClassAttr(self, None))
def __str__(self):
return str(RemoteClassAttr(self, None))
def __str__(self):
return str(RemoteClassAttr(self, None))
def _get_local_repr(self, path):
try:
obj = self._get_local_object(path)
def _get_local_repr(self, path):
try:
obj = self._get_local_object(path)
- return six.reprlib(obj)
+ return moves.reprlib.repr(obj)
except AttributeError:
return None
except AttributeError:
return None
from socket import AF_INET, AF_INET6, inet_ntop
from struct import pack, unpack
from socket import AF_INET, AF_INET6, inet_ntop
from struct import pack, unpack
from scapy.layers.inet import UDP, IP
from scapy.layers.inet6 import IPv6
from scapy.layers.l2 import Ether
from scapy.layers.inet import UDP, IP
from scapy.layers.inet6 import IPv6
from scapy.layers.l2 import Ether
def verify_event(test, event, expected_state):
""" Verify correctness of event values. """
e = event
def verify_event(test, event, expected_state):
""" Verify correctness of event values. """
e = event
- test.logger.debug("BFD: Event: %s" % six.reprlib(e))
+ test.logger.debug("BFD: Event: %s" % moves.reprlib.repr(e))
test.assert_equal(e.sw_if_index,
test.vpp_session.interface.sw_if_index,
"BFD interface index")
test.assert_equal(e.sw_if_index,
test.vpp_session.interface.sw_if_index,
"BFD interface index")
import socket
from abc import abstractmethod, ABCMeta
import socket
from abc import abstractmethod, ABCMeta
from util import Host, mk_ll_addr, mactobinary
from util import Host, mk_ll_addr, mactobinary
raise Exception(
"Could not find interface with sw_if_index %d "
"in interface dump %s" %
raise Exception(
"Could not find interface with sw_if_index %d "
"in interface dump %s" %
- (self.sw_if_index, six.reprlib(r)))
+ (self.sw_if_index, moves.reprlib.repr(r)))
self._local_ip6_ll = mk_ll_addr(self.local_mac)
self._local_ip6n_ll = socket.inet_pton(socket.AF_INET6,
self.local_ip6_ll)
self._local_ip6_ll = mk_ll_addr(self.local_mac)
self._local_ip6n_ll = socket.inet_pton(socket.AF_INET6,
self.local_ip6_ll)
from abc import ABCMeta, abstractmethod
from abc import ABCMeta, abstractmethod
if failed:
logger.error("REG: Couldn't remove configuration for object(s):")
for obj in failed:
if failed:
logger.error("REG: Couldn't remove configuration for object(s):")
for obj in failed:
- logger.error(six.reprlib(obj))
+ logger.error(moves.reprlib.repr(obj))
raise Exception("Couldn't remove configuration for object(s): %s" %
(", ".join(str(x) for x in failed)))
raise Exception("Couldn't remove configuration for object(s): %s" %
(", ".join(str(x) for x in failed)))
import time
from collections import deque
import time
from collections import deque
if hasattr(reply, 'retval') and reply.retval >= 0:
msg = "API call passed unexpectedly: expected negative "\
"return value instead of %d in %s" % \
if hasattr(reply, 'retval') and reply.retval >= 0:
msg = "API call passed unexpectedly: expected negative "\
"return value instead of %d in %s" % \
- (reply.retval, six.reprlib(reply))
+ (reply.retval, moves.reprlib.repr(reply))
self.test_class.logger.info(msg)
raise UnexpectedApiReturnValueError(msg)
elif self._expect_api_retval == self._zero:
if hasattr(reply, 'retval') and reply.retval != expected_retval:
msg = "API call failed, expected %d return value instead "\
"of %d in %s" % (expected_retval, reply.retval,
self.test_class.logger.info(msg)
raise UnexpectedApiReturnValueError(msg)
elif self._expect_api_retval == self._zero:
if hasattr(reply, 'retval') and reply.retval != expected_retval:
msg = "API call failed, expected %d return value instead "\
"of %d in %s" % (expected_retval, reply.retval,
+ moves.reprlib.repr(reply))
self.test_class.logger.info(msg)
raise UnexpectedApiReturnValueError(msg)
else:
self.test_class.logger.info(msg)
raise UnexpectedApiReturnValueError(msg)
else: