From b5b86ee56b4193a3b24c9d626733b9ddca3e88a5 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Mon, 8 May 2023 12:15:35 +0200 Subject: [PATCH] Skip some more tests related to ovn-migration Added option to skip flaky tests during ovn-migration testenvs. Added decorator to StatelessSecurityGroupTest in order to skip these tests during ovn-migration too. Change-Id: I2d30df19dc3e7102b430254db1585e6df33702df --- tobiko/tests/scenario/neutron/test_security_groups.py | 1 + tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tobiko/tests/scenario/neutron/test_security_groups.py b/tobiko/tests/scenario/neutron/test_security_groups.py index 8141a0fbf..2582e5bcf 100644 --- a/tobiko/tests/scenario/neutron/test_security_groups.py +++ b/tobiko/tests/scenario/neutron/test_security_groups.py @@ -123,6 +123,7 @@ class BaseSecurityGroupTest(testtools.TestCase): self._check_sg_rule_in_ovn_nb_db(sg_rule_id, expected_action) +@pytest.mark.skip_during_ovn_migration @neutron.skip_if_missing_networking_extensions('stateful-security-group') class StatelessSecurityGroupTest(BaseSecurityGroupTest): diff --git a/tox.ini b/tox.ini index 0df16627d..188ae7569 100644 --- a/tox.ini +++ b/tox.ini @@ -220,7 +220,7 @@ passenv = {[integration]passenv} setenv = {[testenv:scenario]setenv} OS_TEST_PATH = {toxinidir}/tobiko/tests/scenario - RUN_TESTS_EXTRA_ARGS = -m "not skip_during_ovn_migration" {env:OS_TEST_PATH} + RUN_TESTS_EXTRA_ARGS = -m "not skip_during_ovn_migration and not flaky" {env:OS_TEST_PATH} [testenv:nova] @@ -259,7 +259,7 @@ envdir = {[integration]envdir} passenv = {[integration]passenv} setenv = {[testenv:sanity]setenv} - RUN_TESTS_EXTRA_ARGS = -m "ovn_migration and not skip_during_ovn_migration" {env:OS_TEST_PATH} + RUN_TESTS_EXTRA_ARGS = -m "ovn_migration and not skip_during_ovn_migration and not flaky" {env:OS_TEST_PATH} [testenv:shiftstack_sanity]