Skip to content

Commit 419f739

Browse files
prgeorprgeor
committed
Fix test failure
1 parent 397df8b commit 419f739

File tree

2 files changed

+24
-27
lines changed

2 files changed

+24
-27
lines changed

‎scripts/portstat

+1-4
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,7 @@ class Portstat(object):
290290
format_util(rates.tx_bps, port_speed),
291291
format_number_with_comma(data.tx_err),
292292
format_number_with_comma(data.tx_drop),
293-
format_number_with_comma(data.tx_ovr),
294-
format_number_with_comma(data.fec_corr),
295-
format_number_with_comma(data.fec_uncorr),
296-
format_number_with_comma(data.fec_symbol_err)))
293+
format_number_with_comma(data.tx_ovr)))
297294
elif errors_only:
298295
header = header_errors_only
299296
table.append((key, self.get_port_state(key),

‎tests/portstat_test.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
"""
3636

3737
intf_fec_counters = """\
38-
IFACE STATE FEC_CORR FEC_UNCORR FEC_SYMBOL_ERR
39-
----------- ------- ---------- ------------ ----------------
40-
Ethernet0 D 130,402 3 4
41-
Ethernet8 N/A 110,412 1 0
42-
Ethernet16 N/A 100,317 0 0
38+
IFACE STATE FEC_CORR FEC_UNCORR FEC_SYMBOL_ERR
39+
--------- ------- ---------- ------------ ----------------
40+
Ethernet0 D 130,402 3 4
41+
Ethernet4 N/A 110,412 1 0
42+
Ethernet8 N/A 100,317 0 0
4343
"""
4444

4545
intf_counters_period = """\
@@ -88,30 +88,30 @@
8888
"""
8989

9090
multi_asic_external_intf_counters_printall = """\
91-
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR FEC_CORR FEC_UNCORR
92-
--------- ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- -------- ---------- ------------
93-
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
94-
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
91+
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR
92+
--------- ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- --------
93+
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A
94+
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A
9595
"""
9696

9797
multi_asic_intf_counters_printall = """\
98-
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR FEC_CORR FEC_UNCORR
99-
-------------- ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- -------- ---------- ------------
100-
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
101-
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
102-
Ethernet-BP0 U 6 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 60 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
103-
Ethernet-BP4 U 8 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 80 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
104-
Ethernet-BP256 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
105-
Ethernet-BP260 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
98+
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR
99+
-------------- ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- --------
100+
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A
101+
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A
102+
Ethernet-BP0 U 6 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 60 0.00 B/s 0.00/s 0.00% N/A N/A N/A
103+
Ethernet-BP4 U 8 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 80 0.00 B/s 0.00/s 0.00% N/A N/A N/A
104+
Ethernet-BP256 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A
105+
Ethernet-BP260 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A
106106
"""
107107

108108
multi_asic_intf_counters_asic0_printall = """\
109-
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR FEC_CORR FEC_UNCORR
110-
------------ ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- -------- ---------- ------------
111-
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
112-
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
113-
Ethernet-BP0 U 6 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 60 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
114-
Ethernet-BP4 U 8 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 80 0.00 B/s 0.00/s 0.00% N/A N/A N/A N/A N/A
109+
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR
110+
------------ ------- ------- -------- -------- --------- -------- -------- -------- ------- -------- -------- --------- -------- -------- --------
111+
Ethernet0 U 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A
112+
Ethernet4 U 4 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 40 0.00 B/s 0.00/s 0.00% N/A N/A N/A
113+
Ethernet-BP0 U 6 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 60 0.00 B/s 0.00/s 0.00% N/A N/A N/A
114+
Ethernet-BP4 U 8 0.00 B/s 0.00/s 0.00% 0 1,000 N/A 80 0.00 B/s 0.00/s 0.00% N/A N/A N/A
115115
"""
116116
multi_asic_intf_counters_period = """\
117117
The rates are calculated within 3 seconds period

0 commit comments

Comments
 (0)