From 920b7747f69709bb026a9f530320e7b2eb2b1d84 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 14 Jul 2014 12:37:11 -0400 Subject: [PATCH] Ticket 47855 - clear tmp directory at the start of each test Description: Clear out the tmp directory before starting each test. https://fedorahosted.org/389/ticket/47855 Reviewed by: ? --- dirsrvtests/tickets/ticket47313_test.py | 3 +++ dirsrvtests/tickets/ticket47490_test.py | 5 ++++- dirsrvtests/tickets/ticket47553_single_aci_test.py | 3 +++ dirsrvtests/tickets/ticket47560_test.py | 5 ++++- dirsrvtests/tickets/ticket47573_test.py | 5 ++++- dirsrvtests/tickets/ticket47619_test.py | 5 ++++- dirsrvtests/tickets/ticket47653MMR_test.py | 5 ++++- dirsrvtests/tickets/ticket47653_test.py | 5 ++++- dirsrvtests/tickets/ticket47676_test.py | 5 ++++- dirsrvtests/tickets/ticket47721_test.py | 5 ++++- dirsrvtests/tickets/ticket47781_test.py | 3 +++ dirsrvtests/tickets/ticket47787_test.py | 5 ++++- dirsrvtests/tickets/ticket47808_test.py | 5 ++++- dirsrvtests/tickets/ticket47815_test.py | 3 +++ dirsrvtests/tickets/ticket47819_test.py | 3 +++ dirsrvtests/tickets/ticket47823_test.py | 3 +++ dirsrvtests/tickets/ticket47829_test.py | 5 ++++- 17 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dirsrvtests/tickets/ticket47313_test.py b/dirsrvtests/tickets/ticket47313_test.py index 370dfc6..a946f08 100644 --- a/dirsrvtests/tickets/ticket47313_test.py +++ b/dirsrvtests/tickets/ticket47313_test.py @@ -109,6 +109,9 @@ def topology(request): standalone.stop(timeout=10) standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) + + # clear the tmp directory + standalone.clearTmpDir(__file__) # # Here we have standalone instance up and running diff --git a/dirsrvtests/tickets/ticket47490_test.py b/dirsrvtests/tickets/ticket47490_test.py index eee4cca..51511b9 100644 --- a/dirsrvtests/tickets/ticket47490_test.py +++ b/dirsrvtests/tickets/ticket47490_test.py @@ -272,7 +272,10 @@ def topology(request): consumer.stop(timeout=10) consumer.backupfile = consumer.backupFS() consumer.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47553_single_aci_test.py b/dirsrvtests/tickets/ticket47553_single_aci_test.py index cb62ee1..5911044 100644 --- a/dirsrvtests/tickets/ticket47553_single_aci_test.py +++ b/dirsrvtests/tickets/ticket47553_single_aci_test.py @@ -234,6 +234,9 @@ def topology(request): master2.stop(timeout=10) master2.backupfile = master2.backupFS() master2.start(timeout=10) + + # clear the tmp directory + standalone.clearTmpDir(__file__) # # Here we have two instances master and consumer diff --git a/dirsrvtests/tickets/ticket47560_test.py b/dirsrvtests/tickets/ticket47560_test.py index 67d83e8..0b7e436 100644 --- a/dirsrvtests/tickets/ticket47560_test.py +++ b/dirsrvtests/tickets/ticket47560_test.py @@ -106,7 +106,10 @@ def topology(request): standalone.stop(timeout=10) standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47573_test.py b/dirsrvtests/tickets/ticket47573_test.py index a85fc10..8922426 100644 --- a/dirsrvtests/tickets/ticket47573_test.py +++ b/dirsrvtests/tickets/ticket47573_test.py @@ -273,7 +273,10 @@ def topology(request): consumer.stop(timeout=10) consumer.backupfile = consumer.backupFS() consumer.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47619_test.py b/dirsrvtests/tickets/ticket47619_test.py index a8cacf3..945f68a 100644 --- a/dirsrvtests/tickets/ticket47619_test.py +++ b/dirsrvtests/tickets/ticket47619_test.py @@ -203,7 +203,10 @@ def topology(request): consumer.stop(timeout=10) consumer.backupfile = consumer.backupFS() consumer.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47653MMR_test.py b/dirsrvtests/tickets/ticket47653MMR_test.py index 5d86888..5a3f095 100644 --- a/dirsrvtests/tickets/ticket47653MMR_test.py +++ b/dirsrvtests/tickets/ticket47653MMR_test.py @@ -237,7 +237,10 @@ def topology(request): master2.stop(timeout=10) master2.backupfile = master2.backupFS() master2.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47653_test.py b/dirsrvtests/tickets/ticket47653_test.py index 9f4e757..e0dedbc 100644 --- a/dirsrvtests/tickets/ticket47653_test.py +++ b/dirsrvtests/tickets/ticket47653_test.py @@ -134,7 +134,10 @@ def topology(request): standalone.stop(timeout=10) standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47676_test.py b/dirsrvtests/tickets/ticket47676_test.py index 1d7f0b1..be7e626 100644 --- a/dirsrvtests/tickets/ticket47676_test.py +++ b/dirsrvtests/tickets/ticket47676_test.py @@ -249,7 +249,10 @@ def topology(request): master2.stop(timeout=10) master2.backupfile = master2.backupFS() master2.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47721_test.py b/dirsrvtests/tickets/ticket47721_test.py index 0d6cd8b..955d4bc 100644 --- a/dirsrvtests/tickets/ticket47721_test.py +++ b/dirsrvtests/tickets/ticket47721_test.py @@ -255,7 +255,10 @@ def topology(request): master2.stop(timeout=10) master2.backupfile = master2.backupFS() master2.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47781_test.py b/dirsrvtests/tickets/ticket47781_test.py index 8eb68ba..9b58ef3 100644 --- a/dirsrvtests/tickets/ticket47781_test.py +++ b/dirsrvtests/tickets/ticket47781_test.py @@ -107,6 +107,9 @@ def topology(request): standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47787_test.py b/dirsrvtests/tickets/ticket47787_test.py index d9d3ca9..ecb008c 100644 --- a/dirsrvtests/tickets/ticket47787_test.py +++ b/dirsrvtests/tickets/ticket47787_test.py @@ -237,7 +237,10 @@ def topology(request): master2.stop(timeout=10) master2.backupfile = master2.backupFS() master2.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have two instances master and consumer # with replication working. Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47808_test.py b/dirsrvtests/tickets/ticket47808_test.py index d87dafc..5a16a1f 100644 --- a/dirsrvtests/tickets/ticket47808_test.py +++ b/dirsrvtests/tickets/ticket47808_test.py @@ -110,7 +110,10 @@ def topology(request): standalone.stop(timeout=10) standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47815_test.py b/dirsrvtests/tickets/ticket47815_test.py index 7c8f275..9d09240 100644 --- a/dirsrvtests/tickets/ticket47815_test.py +++ b/dirsrvtests/tickets/ticket47815_test.py @@ -106,6 +106,9 @@ def topology(request): standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47819_test.py b/dirsrvtests/tickets/ticket47819_test.py index 9611f07..7b6f2d5 100644 --- a/dirsrvtests/tickets/ticket47819_test.py +++ b/dirsrvtests/tickets/ticket47819_test.py @@ -107,6 +107,9 @@ def topology(request): standalone.backupfile = standalone.backupFS() standalone.start(timeout=60) + # clear the tmp directory + standalone.clearTmpDir(__file__) + # Here we have standalone instance up and running # Either coming from a backup recovery # or from a fresh (re)init diff --git a/dirsrvtests/tickets/ticket47823_test.py b/dirsrvtests/tickets/ticket47823_test.py index 2322e71..f4d3695 100644 --- a/dirsrvtests/tickets/ticket47823_test.py +++ b/dirsrvtests/tickets/ticket47823_test.py @@ -140,6 +140,9 @@ def topology(request): standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery diff --git a/dirsrvtests/tickets/ticket47829_test.py b/dirsrvtests/tickets/ticket47829_test.py index 8cbfd32..ab8be77 100644 --- a/dirsrvtests/tickets/ticket47829_test.py +++ b/dirsrvtests/tickets/ticket47829_test.py @@ -151,7 +151,10 @@ def topology(request): standalone.stop(timeout=10) standalone.backupfile = standalone.backupFS() standalone.start(timeout=10) - + + # clear the tmp directory + standalone.clearTmpDir(__file__) + # # Here we have standalone instance up and running # Either coming from a backup recovery -- 1.9.3