Skip to content

Commit e04bd2d

Browse files
lguohanlguohan
committed
add testlog for all tests
Signed-off-by: Guohan Lu <[email protected]>
1 parent a2d9be4 commit e04bd2d

23 files changed

+81
-75
lines changed

‎tests/conftest.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,3 +542,9 @@ def dvs(request):
542542
dvs = DockerVirtualSwitch(name)
543543
yield dvs
544544
dvs.destroy()
545+
546+
@pytest.yield_fixture
547+
def testlog(request, dvs):
548+
dvs.runcmd("logger === start test %s ===" % request.node.name)
549+
yield testlog
550+
dvs.runcmd("logger === finish test %s ===" % request.node.name)

‎tests/test_acl.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def verify_acl_lag_binding(self, adb, lag_ids):
130130
assert len(port_groups) == len(lag_ids)
131131
assert set(port_groups) == set(acl_table_groups)
132132

133-
def test_AclTableCreation(self, dvs):
133+
def test_AclTableCreation(self, dvs, testlog):
134134
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
135135
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
136136

@@ -159,7 +159,7 @@ def test_AclTableCreation(self, dvs):
159159
# check port binding
160160
self.verify_acl_port_binding(dvs, adb, bind_ports)
161161

162-
def test_AclRuleL4SrcPort(self, dvs):
162+
def test_AclRuleL4SrcPort(self, dvs, testlog):
163163
"""
164164
hmset ACL_RULE|test|acl_test_rule priority 55 PACKET_ACTION FORWARD L4_SRC_PORT 65000
165165
"""
@@ -210,7 +210,7 @@ def test_AclRuleL4SrcPort(self, dvs):
210210
(status, fvs) = atbl.get(acl_entry[0])
211211
assert status == False
212212

213-
def test_AclRuleInOutPorts(self, dvs):
213+
def test_AclRuleInOutPorts(self, dvs, testlog):
214214
"""
215215
hmset ACL_RULE|test|acl_test_rule priority 55 PACKET_ACTION FORWARD IN_PORTS Ethernet0,Ethernet4 OUT_PORTS Ethernet8,Ethernet12
216216
"""
@@ -270,7 +270,7 @@ def test_AclRuleInOutPorts(self, dvs):
270270
(status, fvs) = atbl.get(acl_entry[0])
271271
assert status == False
272272

273-
def test_AclTableDeletion(self, dvs):
273+
def test_AclTableDeletion(self, dvs, testlog):
274274

275275
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
276276
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -286,7 +286,7 @@ def test_AclTableDeletion(self, dvs):
286286
# only the default table was left along with DTel tables
287287
assert len(keys) >= 1
288288

289-
def test_V6AclTableCreation(self, dvs):
289+
def test_V6AclTableCreation(self, dvs, testlog):
290290

291291
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
292292
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -359,7 +359,7 @@ def test_V6AclTableCreation(self, dvs):
359359

360360
assert set(port_groups) == set(acl_table_groups)
361361

362-
def test_V6AclRuleIPv6Any(self, dvs):
362+
def test_V6AclRuleIPv6Any(self, dvs, testlog):
363363
"""
364364
hmset ACL_RULE|test-aclv6|test_rule1 priority 1000 PACKET_ACTION FORWARD IPv6Any
365365
"""
@@ -410,7 +410,7 @@ def test_V6AclRuleIPv6Any(self, dvs):
410410
(status, fvs) = atbl.get(acl_entry[0])
411411
assert status == False
412412

413-
def test_V6AclRuleIPv6AnyDrop(self, dvs):
413+
def test_V6AclRuleIPv6AnyDrop(self, dvs, testlog):
414414
"""
415415
hmset ACL_RULE|test-aclv6|test_rule2 priority 1002 PACKET_ACTION DROP IPv6Any
416416
"""
@@ -461,7 +461,7 @@ def test_V6AclRuleIPv6AnyDrop(self, dvs):
461461
(status, fvs) = atbl.get(acl_entry[0])
462462
assert status == False
463463

464-
def test_V6AclRuleIpProtocol(self, dvs):
464+
def test_V6AclRuleIpProtocol(self, dvs, testlog):
465465
"""
466466
hmset ACL_RULE|test-aclv6|test_rule3 priority 1003 PACKET_ACTION DROP IP_PROTOCOL 6
467467
"""
@@ -512,7 +512,7 @@ def test_V6AclRuleIpProtocol(self, dvs):
512512
(status, fvs) = atbl.get(acl_entry[0])
513513
assert status == False
514514

515-
def test_V6AclRuleSrcIPv6(self, dvs):
515+
def test_V6AclRuleSrcIPv6(self, dvs, testlog):
516516
"""
517517
hmset ACL_RULE|test-aclv6|test_rule4 priority 1004 PACKET_ACTION DROP SRC_IPV6 2777::0/64
518518
"""
@@ -563,7 +563,7 @@ def test_V6AclRuleSrcIPv6(self, dvs):
563563
(status, fvs) = atbl.get(acl_entry[0])
564564
assert status == False
565565

566-
def test_V6AclRuleDstIPv6(self, dvs):
566+
def test_V6AclRuleDstIPv6(self, dvs, testlog):
567567
"""
568568
hmset ACL_RULE|test-aclv6|test_rule5 priority 1005 PACKET_ACTION DROP DST_IPV6 2002::2/128
569569
"""
@@ -614,7 +614,7 @@ def test_V6AclRuleDstIPv6(self, dvs):
614614
(status, fvs) = atbl.get(acl_entry[0])
615615
assert status == False
616616

617-
def test_V6AclRuleL4SrcPort(self, dvs):
617+
def test_V6AclRuleL4SrcPort(self, dvs, testlog):
618618
"""
619619
hmset ACL_RULE|test-aclv6|test_rule6 priority 1006 PACKET_ACTION DROP L4_SRC_PORT 65000
620620
"""
@@ -665,7 +665,7 @@ def test_V6AclRuleL4SrcPort(self, dvs):
665665
(status, fvs) = atbl.get(acl_entry[0])
666666
assert status == False
667667

668-
def test_V6AclRuleL4DstPort(self, dvs):
668+
def test_V6AclRuleL4DstPort(self, dvs, testlog):
669669
"""
670670
hmset ACL_RULE|test-aclv6|test_rule7 priority 1007 PACKET_ACTION DROP L4_DST_PORT 65001
671671
"""
@@ -716,7 +716,7 @@ def test_V6AclRuleL4DstPort(self, dvs):
716716
(status, fvs) = atbl.get(acl_entry[0])
717717
assert status == False
718718

719-
def test_V6AclRuleTCPFlags(self, dvs):
719+
def test_V6AclRuleTCPFlags(self, dvs, testlog):
720720
"""
721721
hmset ACL_RULE|test-aclv6|test_rule8 priority 1008 PACKET_ACTION DROP TCP_FLAGS 0x7/0x3f
722722
"""
@@ -767,7 +767,7 @@ def test_V6AclRuleTCPFlags(self, dvs):
767767
(status, fvs) = atbl.get(acl_entry[0])
768768
assert status == False
769769

770-
def test_V6AclRuleL4SrcPortRange(self, dvs):
770+
def test_V6AclRuleL4SrcPortRange(self, dvs, testlog):
771771
"""
772772
hmset ACL_RULE|test-aclv6|test_rule9 priority 1009 PACKET_ACTION DROP L4_SRC_PORT_RANGE 1-100
773773
"""
@@ -832,7 +832,7 @@ def test_V6AclRuleL4SrcPortRange(self, dvs):
832832
(status, fvs) = atbl.get(acl_entry[0])
833833
assert status == False
834834

835-
def test_V6AclRuleL4DstPortRange(self, dvs):
835+
def test_V6AclRuleL4DstPortRange(self, dvs, testlog):
836836
"""
837837
hmset ACL_RULE|test-aclv6|test_rule10 priority 1010 PACKET_ACTION DROP L4_DST_PORT_RANGE 101-200
838838
"""
@@ -897,7 +897,7 @@ def test_V6AclRuleL4DstPortRange(self, dvs):
897897
(status, fvs) = atbl.get(acl_entry[0])
898898
assert status == False
899899

900-
def test_V6AclTableDeletion(self, dvs):
900+
def test_V6AclTableDeletion(self, dvs, testlog):
901901

902902
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
903903
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -928,7 +928,7 @@ def check_rule_existence(self, entry, rules, verifs):
928928
#did not find the rule
929929
return False
930930

931-
def test_InsertAclRuleBetweenPriorities(self, dvs):
931+
def test_InsertAclRuleBetweenPriorities(self, dvs, testlog):
932932
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
933933
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
934934

@@ -1026,7 +1026,7 @@ def test_InsertAclRuleBetweenPriorities(self, dvs):
10261026
# only the default table was left
10271027
assert len(keys) >= 1
10281028

1029-
def test_RulesWithDiffMaskLengths(self, dvs):
1029+
def test_RulesWithDiffMaskLengths(self, dvs, testlog):
10301030
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
10311031
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
10321032

@@ -1111,7 +1111,7 @@ def test_RulesWithDiffMaskLengths(self, dvs):
11111111
keys = atbl.getKeys()
11121112
assert len(keys) >= 1
11131113

1114-
def test_AclTableCreationOnLAGMember(self, dvs):
1114+
def test_AclTableCreationOnLAGMember(self, dvs, testlog):
11151115
# prepare db and tables
11161116
self.clean_up_left_over(dvs)
11171117
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
@@ -1139,7 +1139,7 @@ def test_AclTableCreationOnLAGMember(self, dvs):
11391139
# verify test result - ACL table creation should fail
11401140
assert self.verify_if_any_acl_table_created(dvs, adb) == False
11411141

1142-
def test_AclTableCreationOnLAG(self, dvs):
1142+
def test_AclTableCreationOnLAG(self, dvs, testlog):
11431143
# prepare db and tables
11441144
self.clean_up_left_over(dvs)
11451145
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
@@ -1189,7 +1189,7 @@ def test_AclTableCreationOnLAG(self, dvs):
11891189
tbl = swsscommon.Table(db, "ACL_TABLE")
11901190
tbl._del("test_LAG")
11911191

1192-
def test_AclTableCreationBeforeLAG(self, dvs):
1192+
def test_AclTableCreationBeforeLAG(self, dvs, testlog):
11931193
# prepare db and tables
11941194
self.clean_up_left_over(dvs)
11951195
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)

‎tests/test_crm.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def setReadOnlyAttr(dvs, obj, attr, val):
3939
ntf.send("set_ro", key, fvp)
4040

4141

42-
def test_CrmFdbEntry(dvs):
42+
def test_CrmFdbEntry(dvs, testlog):
4343

4444
dvs.runcmd("crm config polling interval 1")
4545

@@ -92,7 +92,7 @@ def test_CrmFdbEntry(dvs):
9292
assert new_avail_counter == avail_counter
9393

9494

95-
def test_CrmIpv4Route(dvs):
95+
def test_CrmIpv4Route(dvs, testlog):
9696

9797
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up")
9898

@@ -141,7 +141,7 @@ def test_CrmIpv4Route(dvs):
141141
assert new_avail_counter == avail_counter
142142

143143

144-
def test_CrmIpv6Route(dvs):
144+
def test_CrmIpv6Route(dvs, testlog):
145145

146146
# Enable IPv6 routing
147147
dvs.runcmd("sysctl net.ipv6.conf.all.disable_ipv6=0")
@@ -197,7 +197,7 @@ def test_CrmIpv6Route(dvs):
197197
assert new_avail_counter == avail_counter
198198

199199

200-
def test_CrmIpv4Nexthop(dvs):
200+
def test_CrmIpv4Nexthop(dvs, testlog):
201201

202202
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up")
203203

@@ -238,7 +238,7 @@ def test_CrmIpv4Nexthop(dvs):
238238
assert new_avail_counter == avail_counter
239239

240240

241-
def test_CrmIpv6Nexthop(dvs):
241+
def test_CrmIpv6Nexthop(dvs, testlog):
242242

243243
# Enable IPv6 routing
244244
dvs.runcmd("sysctl net.ipv6.conf.all.disable_ipv6=0")
@@ -283,7 +283,7 @@ def test_CrmIpv6Nexthop(dvs):
283283
assert new_avail_counter == avail_counter
284284

285285

286-
def test_CrmIpv4Neighbor(dvs):
286+
def test_CrmIpv4Neighbor(dvs, testlog):
287287

288288
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up")
289289

@@ -324,7 +324,7 @@ def test_CrmIpv4Neighbor(dvs):
324324
assert new_avail_counter == avail_counter
325325

326326

327-
def test_CrmIpv6Neighbor(dvs):
327+
def test_CrmIpv6Neighbor(dvs, testlog):
328328

329329
# Enable IPv6 routing
330330
dvs.runcmd("sysctl net.ipv6.conf.all.disable_ipv6=0")
@@ -369,7 +369,7 @@ def test_CrmIpv6Neighbor(dvs):
369369
assert new_avail_counter == avail_counter
370370

371371

372-
def test_CrmNexthopGroup(dvs):
372+
def test_CrmNexthopGroup(dvs, testlog):
373373

374374
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up")
375375
dvs.runcmd("ifconfig Ethernet4 10.0.0.2/31 up")
@@ -421,7 +421,7 @@ def test_CrmNexthopGroup(dvs):
421421
assert new_avail_counter == avail_counter
422422

423423

424-
def test_CrmNexthopGroupMember(dvs):
424+
def test_CrmNexthopGroupMember(dvs, testlog):
425425

426426
# down, then up to generate port up signal
427427
dvs.servers[0].runcmd("ip link set down dev eth0") == 0
@@ -479,7 +479,7 @@ def test_CrmNexthopGroupMember(dvs):
479479
assert new_avail_counter == avail_counter
480480

481481

482-
def test_CrmAcl(dvs):
482+
def test_CrmAcl(dvs, testlog):
483483

484484
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
485485
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)

‎tests/test_dirbcast.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import re
44
import json
55

6-
def test_DirectedBroadcast(dvs):
6+
def test_DirectedBroadcast(dvs, testlog):
77

88
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
99
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)

‎tests/test_dtel.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import json
77

88
class TestDtel(object):
9-
def test_DtelGlobalAttribs(self, dvs):
9+
def test_DtelGlobalAttribs(self, dvs, testlog):
1010

1111
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
1212
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -86,7 +86,7 @@ def test_DtelGlobalAttribs(self, dvs):
8686
tbl._del("QUEUE_REPORT")
8787
tbl._del("SINK_PORT_LIST")
8888

89-
def test_DtelReportSessionAttribs(self, dvs):
89+
def test_DtelReportSessionAttribs(self, dvs, testlog):
9090

9191
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
9292
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -127,7 +127,7 @@ def test_DtelReportSessionAttribs(self, dvs):
127127

128128
tbl._del("RS-1")
129129

130-
def test_DtelINTSessionAttribs(self, dvs):
130+
def test_DtelINTSessionAttribs(self, dvs, testlog):
131131

132132
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
133133
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -171,7 +171,7 @@ def test_DtelINTSessionAttribs(self, dvs):
171171

172172
tbl._del("INT-1")
173173

174-
def test_DtelQueueReportAttribs(self, dvs):
174+
def test_DtelQueueReportAttribs(self, dvs, testlog):
175175

176176
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
177177
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
@@ -212,7 +212,7 @@ def test_DtelQueueReportAttribs(self, dvs):
212212
tbl._del("Ethernet0|0")
213213

214214

215-
def test_DtelEventAttribs(self, dvs):
215+
def test_DtelEventAttribs(self, dvs, testlog):
216216

217217
db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
218218
adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)

‎tests/test_fdb_cold.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def how_many_entries_exist(db, table):
2424
tbl = swsscommon.Table(db, table)
2525
return len(tbl.getKeys())
2626

27-
def test_FDBAddedAfterMemberCreated(dvs):
27+
def test_FDBAddedAfterMemberCreated(dvs, testlog):
2828
dvs.setup_db()
2929

3030
dvs.runcmd("sonic-clear fdb all")

‎tests/test_fdb_warm.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def how_many_entries_exist(db, table):
2424
tbl = swsscommon.Table(db, table)
2525
return len(tbl.getKeys())
2626

27-
def test_fdb_notifications(dvs):
27+
def test_fdb_notifications(dvs, testlog):
2828
dvs.setup_db()
2929

3030
dvs.runcmd("sonic-clear fdb all")

‎tests/test_interface.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def set_mtu(self, interface, mtu):
2626
tbl.set(interface, fvs)
2727
time.sleep(1)
2828

29-
def test_InterfaceAddRemoveIpv4Address(self, dvs):
29+
def test_InterfaceAddRemoveIpv4Address(self, dvs, testlog):
3030
self.setup_db(dvs)
3131

3232
# assign IP to interface
@@ -95,7 +95,7 @@ def test_InterfaceAddRemoveIpv4Address(self, dvs):
9595
if route["dest"] == "10.0.0.4/32":
9696
assert False
9797

98-
def test_InterfaceSetMtu(self, dvs):
98+
def test_InterfaceSetMtu(self, dvs, testlog):
9999
self.setup_db(dvs)
100100

101101
# assign IP to interface
@@ -175,7 +175,7 @@ def set_mtu(self, interface, mtu):
175175
tbl.set(interface, fvs)
176176
time.sleep(1)
177177

178-
def test_InterfaceAddRemoveIpv4Address(self, dvs):
178+
def test_InterfaceAddRemoveIpv4Address(self, dvs, testlog):
179179
self.setup_db(dvs)
180180

181181
# create port channel
@@ -251,7 +251,7 @@ def test_InterfaceAddRemoveIpv4Address(self, dvs):
251251
self.remove_port_channel(dvs, "PortChannel001")
252252

253253

254-
def test_InterfaceSetMtu(self, dvs):
254+
def test_InterfaceSetMtu(self, dvs, testlog):
255255
self.setup_db(dvs)
256256

257257
# create port channel

0 commit comments

Comments
 (0)