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

Change contentdb reference to site object in test

Browse source
This commit is contained in:
shortcutme 2016-11-07 23:20:52 +01:00
parent bd51c61eb6
commit 5fafe7cf29
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Test/conftest.py
View file

@ -118,7 +118,7 @@ def site(request):
shutil.copytree(site.storage.getPath("") + "-original", site.storage.getPath("")) shutil.copytree(site.storage.getPath("") + "-original", site.storage.getPath(""))
def cleanup(): def cleanup():
site.storage.deleteFiles() site.storage.deleteFiles()
site.content_manager.contents.db.deleteSite("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT") site.content_manager.contents.db.deleteSite(site)
del SiteManager.site_manager.sites["1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT"] del SiteManager.site_manager.sites["1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT"]
site.content_manager.contents.db.close() site.content_manager.contents.db.close()
db_path = "%s/content.db" % config.data_dir db_path = "%s/content.db" % config.data_dir
@ -143,7 +143,7 @@ def site_temp(request):
def cleanup(): def cleanup():
site_temp.storage.deleteFiles() site_temp.storage.deleteFiles()
site_temp.content_manager.contents.db.deleteSite("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT") site_temp.content_manager.contents.db.deleteSite(site_temp)
site_temp.content_manager.contents.db.close() site_temp.content_manager.contents.db.close()
db_path = "%s-temp/content.db" % config.data_dir db_path = "%s-temp/content.db" % config.data_dir
os.unlink(db_path) os.unlink(db_path)