test: Use temporary directories, instead of deleting directories

tests/__init__.py

@@ -1,7 +1,5 @@
 import io
-import os.path
 import pkgutil
-import shutil
 
 
 def get_egg_data(basename):
@@ -10,12 +8,3 @@ def get_egg_data(basename):
 
 def root_add_version(root, project, version, basename):
     root.eggstorage.put(io.BytesIO(get_egg_data(basename)), project, version)
-
-
-def clean(config, setting):
-    directory = os.path.realpath(config.get(setting))
-    basedir = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
-    # Avoid accidentally deleting directories outside the project.
-    assert os.path.commonprefix((directory, basedir)) == basedir
-    if os.path.exists(directory):
-        shutil.rmtree(directory)

tests/conftest.py

@@ -6,7 +6,7 @@
 from scrapyd import Config
 from scrapyd.app import application
 from scrapyd.website import Root
-from tests import clean, root_add_version
+from tests import root_add_version
 
 
 @pytest.fixture()
@@ -16,18 +16,17 @@ def txrequest():
     return Request(http_channel)
 
 
-@pytest.fixture(params=[None, ("scrapyd", "items_dir", "items")], ids=["default", "items_dir"])
-def root(request):
+@pytest.fixture(params=[None, (Config.SECTION, "items_dir", "items")], ids=["default", "items_dir"])
+def root(request, monkeypatch, tmpdir):
+    monkeypatch.chdir(tmpdir)
+
     config = Config()
     if request.param:
         config.cp.set(*request.param)
 
     app = application(config)
 
-    yield Root(config, app)
-
-    for setting in ("dbs_dir", "eggs_dir"):
-        clean(config, setting)
+    return Root(config, app)
 
 
 @pytest.fixture()

tests/test_webservice.py

@@ -5,20 +5,17 @@
 import pytest
 from twisted.web import error
 
-from scrapyd.config import Config
 from scrapyd.exceptions import DirectoryTraversalError, RunnerError
 from scrapyd.interfaces import IEggStorage, IJobStorage
 from scrapyd.jobstorage import Job
 from scrapyd.txapp import application
 from scrapyd.webservice import UtilsCache, get_spider_list
-from tests import clean, get_egg_data, root_add_version
+from tests import get_egg_data, root_add_version
 
 
 @pytest.fixture()
 def app():
-    yield application
-
-    clean(Config(), "eggs_dir")
+    return application
 
 
 def add_test_version(app, project, version, basename):