X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_flowprobe.py;h=bb5062755f93740e209ba3980d88debb2f108d4d;hb=6ebc6eb3d27e0abbc66dbb2548808e1a338f89b4;hp=d2fd031777c67a9e8568b809f881bf1fa7891c0f;hpb=6e4c6ad92e59045f0babf5af5093cb8402ec37fb;p=vpp.git diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py index d2fd031777c..bb5062755f9 100644 --- a/test/test_flowprobe.py +++ b/test/test_flowprobe.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +from __future__ import print_function import binascii import random import socket @@ -215,11 +215,11 @@ class MethodHolder(VppTestCase): data_set={1: 'octets', 2: 'packets'}, ip_ver='v4'): if self.debug_print: - print capture[0].show() + print(capture[0].show()) if cflow.haslayer(Data): data = decoder.decode_data_set(cflow.getlayer(Set)) if self.debug_print: - print data + print(data) if ip_ver == 'v4': ip_layer = capture[0][IP] else: @@ -824,7 +824,7 @@ class Datapath(MethodHolder): self.logger.info("FFP_TEST_FINISH_0002") -@unittest.skipUnless(running_extended_tests(), "part of extended tests") +@unittest.skipUnless(running_extended_tests, "part of extended tests") class DisableIPFIX(MethodHolder): """Disable IPFIX""" @@ -865,7 +865,7 @@ class DisableIPFIX(MethodHolder): self.logger.info("FFP_TEST_FINISH_0001") -@unittest.skipUnless(running_extended_tests(), "part of extended tests") +@unittest.skipUnless(running_extended_tests, "part of extended tests") class ReenableIPFIX(MethodHolder): """Re-enable IPFIX""" @@ -926,7 +926,7 @@ class ReenableIPFIX(MethodHolder): self.logger.info("FFP_TEST_FINISH_0001") -@unittest.skipUnless(running_extended_tests(), "part of extended tests") +@unittest.skipUnless(running_extended_tests, "part of extended tests") class DisableFP(MethodHolder): """Disable Flowprobe feature""" @@ -966,7 +966,7 @@ class DisableFP(MethodHolder): self.logger.info("FFP_TEST_FINISH_0001") -@unittest.skipUnless(running_extended_tests(), "part of extended tests") +@unittest.skipUnless(running_extended_tests, "part of extended tests") class ReenableFP(MethodHolder): """Re-enable Flowprobe feature"""