tests: always use clean_temporary_pub to cleanup (#83951)

tests/test_categories.py

@@ -1,7 +1,6 @@
 import io
 import os
 import pickle
-import shutil
 import time
 
 import pytest
@@ -10,7 +9,7 @@ from quixote import cleanup
 
 from wcs.categories import CardDefCategory, Category
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -22,7 +21,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 @pytest.mark.parametrize('category_class', [Category, CardDefCategory])

tests/test_prefill.py

@@ -1,6 +1,5 @@
 import datetime
 import os
-import shutil
 
 import pytest
 from quixote import cleanup, get_request
@@ -9,7 +8,7 @@ from wcs import fields
 from wcs.carddef import CardDef
 from wcs.qommon.http_request import HTTPRequest
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -45,7 +44,7 @@ def user(request):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 def test_prefill_string():

tests/test_publisher.py

@@ -29,7 +29,7 @@ from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.publisher import Tenant
 from wcs.workflows import Workflow
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -41,7 +41,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 def get_request():

tests/test_saml2utils.py

@@ -1,11 +1,9 @@
-import shutil
-
 from quixote import cleanup
 
 from wcs.qommon import x509utils
 from wcs.qommon.saml2utils import Metadata
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -15,7 +13,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 def test_metadata_generation():

tests/test_storage.py

@@ -1,7 +1,6 @@
 import datetime
 import os
 import random
-import shutil
 import time
 
 import pytest
@@ -10,7 +9,7 @@ from quixote import cleanup
 import wcs.qommon.storage as st
 from wcs.qommon.storage import StorableObject, cache_umask
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -20,7 +19,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 class Foobar(StorableObject):

tests/test_texts.py

@@ -1,11 +1,9 @@
-import shutil
-
 from quixote import cleanup
 
 from wcs.qommon.admin.texts import TextsDirectory
 from wcs.qommon.http_request import HTTPRequest
 
-from .utilities import MockSubstitutionVariables, create_temporary_pub
+from .utilities import MockSubstitutionVariables, clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -21,7 +19,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 def test_get_html_text_unset():

tests/test_widgets.py

@@ -2,7 +2,6 @@ import copy
 import datetime
 import decimal
 import os
-import shutil
 
 import mechanize
 import pytest
@@ -40,7 +39,7 @@ from wcs.qommon.form import (
 from wcs.qommon.http_request import HTTPRequest
 from wcs.wf.profile import ProfileUpdateRowWidget
 
-from .utilities import create_temporary_pub
+from .utilities import clean_temporary_pub, create_temporary_pub
 
 
 def setup_module(module):
@@ -54,7 +53,7 @@ def setup_module(module):
 
 
 def teardown_module(module):
-    shutil.rmtree(pub.APP_DIR)
+    clean_temporary_pub()
 
 
 class MockHtmlForm: