From 8475188b6c604237a6c22a665c8268939c4fa8c9 Mon Sep 17 00:00:00 2001 From: Simon Pichugin Date: Fri, 23 Feb 2018 15:24:30 +0100 Subject: [PATCH] Remove tearDown --- dirsrvtests/tests/suites/replication/conflict_resolve_test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py index 31b9aebbe..be725fad8 100644 --- a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py +++ b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py @@ -139,25 +139,27 @@ def _delete_test_base(inst, test_base_dn): pass -@pytest.fixture +@pytest.fixture(scope="class") def test_base(topology_m2, request): tb = _test_base(topology_m2) def fin(): if not DEBUGGING: - _delete_test_base(topology_m2.ms["master1"], tb.dn) + #_delete_test_base(topology_m2.ms["master1"], tb.dn) + pass request.addfinalizer(fin) return tb -@pytest.fixture +@pytest.fixture(scope="class") def test_base_m3(topology_m3, request): tb = _test_base(topology_m3) def fin(): if not DEBUGGING: - _delete_test_base(topology_m3.ms["master1"], tb.dn) + #_delete_test_base(topology_m3.ms["master1"], tb.dn) + pass request.addfinalizer(fin) return tb -- 2.14.3