Skip to content

Commit af5e1e1

Browse files
committed
Introduce _test_MirrorToVlanAddRemove
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
1 parent 61149a5 commit af5e1e1

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

tests/test_mirror.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,7 @@ def remove_fdb(self, vlan, mac):
248248
tbl._del("Vlan" + vlan + ":" + mac)
249249
time.sleep(1)
250250

251-
252-
# Ignore testcase in Debian Jessie
253-
# TODO: Remove this skip if Jessie support is no longer needed
254-
@pytest.mark.skipif(StrictVersion(distro.linux_distribution()[1]) <= StrictVersion('8.9'), reason="Debian 8.9 or before has no support")
255-
def test_MirrorToVlanAddRemove(self, dvs, testlog):
251+
def _test_MirrorToVlanAddRemove(self, dvs, testlog):
256252
"""
257253
This test covers basic mirror session creation and removal operation
258254
with destination port sits in a VLAN
@@ -263,7 +259,6 @@ def test_MirrorToVlanAddRemove(self, dvs, testlog):
263259
3. Remove FDB; remove neighbor; remove IP; remove VLAN
264260
4. Remove mirror session
265261
"""
266-
self.setup_db(dvs)
267262

268263
session = "TEST_SESSION"
269264
src_ip = "5.5.5.5"
@@ -366,6 +361,14 @@ def test_MirrorToVlanAddRemove(self, dvs, testlog):
366361
self.remove_mirror_session(session)
367362
self.check_syslog(dvs, marker, "Detached next hop observer for destination IP {}".format(dst_ip), 1)
368363

364+
# Ignore testcase in Debian Jessie
365+
# TODO: Remove this skip if Jessie support is no longer needed
366+
@pytest.mark.skipif(StrictVersion(distro.linux_distribution()[1]) <= StrictVersion('8.9'), reason="Debian 8.9 or before has no support")
367+
def test_MirrorToVlanAddRemove(self, dvs, testlog):
368+
self.setup_db(dvs)
369+
370+
self._test_MirrorToVlanAddRemove(dvs, testlog)
371+
369372
def create_port_channel(self, dvs, channel):
370373
tbl = swsscommon.ProducerStateTable(self.pdb, "LAG_TABLE")
371374
fvs = swsscommon.FieldValuePairs([("admin", "up"), ("mtu", "9100")])

0 commit comments

Comments
 (0)