Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VOM: mroutes
[vpp.git]
/
test
/
test_flowprobe.py
diff --git
a/test/test_flowprobe.py
b/test/test_flowprobe.py
index
d2fd031
..
bb50627
100644
(file)
--- a/
test/test_flowprobe.py
+++ b/
test/test_flowprobe.py
@@
-1,5
+1,5
@@
#!/usr/bin/env python
#!/usr/bin/env python
-
+from __future__ import print_function
import binascii
import random
import socket
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:
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:
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:
if ip_ver == 'v4':
ip_layer = capture[0][IP]
else:
@@
-824,7
+824,7
@@
class Datapath(MethodHolder):
self.logger.info("FFP_TEST_FINISH_0002")
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"""
class DisableIPFIX(MethodHolder):
"""Disable IPFIX"""
@@
-865,7
+865,7
@@
class DisableIPFIX(MethodHolder):
self.logger.info("FFP_TEST_FINISH_0001")
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"""
class ReenableIPFIX(MethodHolder):
"""Re-enable IPFIX"""
@@
-926,7
+926,7
@@
class ReenableIPFIX(MethodHolder):
self.logger.info("FFP_TEST_FINISH_0001")
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"""
class DisableFP(MethodHolder):
"""Disable Flowprobe feature"""
@@
-966,7
+966,7
@@
class DisableFP(MethodHolder):
self.logger.info("FFP_TEST_FINISH_0001")
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"""
class ReenableFP(MethodHolder):
"""Re-enable Flowprobe feature"""