Merge "Mark "test_keepalived_spawns_conflicting_pid_*" tests as unstable"
This commit is contained in:
commit
5d01a4efc7
|
@ -23,6 +23,7 @@ from neutron.agent.linux import ip_lib
|
||||||
from neutron.agent.linux import keepalived
|
from neutron.agent.linux import keepalived
|
||||||
from neutron.common import utils as common_utils
|
from neutron.common import utils as common_utils
|
||||||
from neutron.conf.agent.l3 import config as l3_config
|
from neutron.conf.agent.l3 import config as l3_config
|
||||||
|
from neutron.tests import base as tests_base
|
||||||
from neutron.tests.common import net_helpers
|
from neutron.tests.common import net_helpers
|
||||||
from neutron.tests.functional.agent.linux import helpers
|
from neutron.tests.functional.agent.linux import helpers
|
||||||
from neutron.tests.functional import base
|
from neutron.tests.functional import base
|
||||||
|
@ -119,11 +120,13 @@ class KeepalivedManagerTestCase(base.BaseSudoTestCase,
|
||||||
|
|
||||||
self._spawn_keepalived(self.manager)
|
self._spawn_keepalived(self.manager)
|
||||||
|
|
||||||
|
@tests_base.unstable_test("bug 1921154")
|
||||||
def test_keepalived_spawns_conflicting_pid_base_process(self):
|
def test_keepalived_spawns_conflicting_pid_base_process(self):
|
||||||
process = self.manager.get_process()
|
process = self.manager.get_process()
|
||||||
pid_file = process.get_pid_file_name()
|
pid_file = process.get_pid_file_name()
|
||||||
self._test_keepalived_spawns_conflicting_pid(process, pid_file)
|
self._test_keepalived_spawns_conflicting_pid(process, pid_file)
|
||||||
|
|
||||||
|
@tests_base.unstable_test("bug 1921154")
|
||||||
def test_keepalived_spawns_conflicting_pid_vrrp_subprocess(self):
|
def test_keepalived_spawns_conflicting_pid_vrrp_subprocess(self):
|
||||||
process = self.manager.get_process()
|
process = self.manager.get_process()
|
||||||
pid_file = process.get_pid_file_name()
|
pid_file = process.get_pid_file_name()
|
||||||
|
|
Loading…
Reference in New Issue