Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-1508: Python3 tests. Explicitly specify string formatting.
[vpp.git]
/
test
/
test_classify_l2_acl.py
diff --git
a/test/test_classify_l2_acl.py
b/test/test_classify_l2_acl.py
index
5c9ccc9
..
0795907
100644
(file)
--- a/
test/test_classify_l2_acl.py
+++ b/
test/test_classify_l2_acl.py
@@
-174,8
+174,8
@@
class TestClassifyAcl(VppTestCase):
:param str ether_type: ethernet type <0-ffff>
"""
:param str ether_type: ethernet type <0-ffff>
"""
- return ('{
:0>12}{:0>12}{:0>4}'.format(dst_mac, src_mac,
-
ether_type)).rstrip('0')
+ return ('{
!s:0>12}{!s:0>12}{!s:0>4}'.format(
+
dst_mac, src_mac,
ether_type)).rstrip('0')
@staticmethod
def build_mac_match(dst_mac='', src_mac='', ether_type=''):
@staticmethod
def build_mac_match(dst_mac='', src_mac='', ether_type=''):
@@
-190,8
+190,8
@@
class TestClassifyAcl(VppTestCase):
if src_mac:
src_mac = src_mac.replace(':', '')
if src_mac:
src_mac = src_mac.replace(':', '')
- return ('{
:0>12}{:0>12}{:0>4}'.format(dst_mac, src_mac,
-
ether_type)).rstrip('0')
+ return ('{
!s:0>12}{!s:0>12}{!s:0>4}'.format(
+
dst_mac, src_mac,
ether_type)).rstrip('0')
def create_classify_table(self, key, mask, data_offset=0, is_add=1):
"""Create Classify Table
def create_classify_table(self, key, mask, data_offset=0, is_add=1):
"""Create Classify Table