oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better cleanup after tests

Browse source
This commit is contained in:
shortcutme 2019-03-27 03:10:21 +01:00
parent 74e71a1971
commit b6286372fb
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Test/conftest.py
View file

@ -7,6 +7,7 @@ import json
import shutil import shutil
import gc import gc
import datetime import datetime
import atexit
import pytest import pytest
import mock import mock
@ -74,11 +75,6 @@ from Plugin import PluginManager
config.data_dir = "src/Test/testdata" # Use test data for unittests config.data_dir = "src/Test/testdata" # Use test data for unittests
os.chdir(os.path.abspath(os.path.dirname(__file__) + "/../..")) # Set working dir os.chdir(os.path.abspath(os.path.dirname(__file__) + "/../..")) # Set working dir
# Cleanup content.db caches
if os.path.isfile("%s/content.db" % config.data_dir):
os.unlink("%s/content.db" % config.data_dir)
if os.path.isfile("%s-temp/content.db" % config.data_dir):
os.unlink("%s-temp/content.db" % config.data_dir)
PluginManager.plugin_manager.loadPlugins() PluginManager.plugin_manager.loadPlugins()
config.loadPlugins() config.loadPlugins()
@ -106,6 +102,19 @@ from util import RateLimit
from Db import Db from Db import Db
def cleanup():
sys.modules["Db.Db"].dbCloseAll()
for dir_path in [config.data_dir, config.data_dir + "-temp"]:
for file_name in os.listdir(dir_path):
ext = file_name.rsplit(".", 1)[-1]
if ext not in ["csr", "pem", "srl", "db", "json"]:
continue
file_path = dir_path + "/" + file_name
if os.path.isfile(file_path):
os.unlink(file_path)
atexit.register(cleanup)
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def resetSettings(request): def resetSettings(request):
open("%s/sites.json" % config.data_dir, "w").write("{}") open("%s/sites.json" % config.data_dir, "w").write("{}")