mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

overlay_dir -> overlay_tree_dir

Browse source
This commit is contained in:
The MMGen Project 2022-10-24 16:50:04 +00:00
commit 3e8f796390
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/overlay/__init__.py
View file

@ -1,6 +1,6 @@
import sys,os,shutil
def get_overlay_dir(repo_root):
def get_overlay_tree_dir(repo_root):
return os.path.join(repo_root,'test','overlay','tree')
def overlay_setup(repo_root):
@ -8,7 +8,7 @@ def overlay_setup(repo_root):
def process_srcdir(d):
relpath = d.split('.')
srcdir = os.path.join(repo_root,*relpath)
destdir = os.path.join(overlay_dir,*relpath)
destdir = os.path.join(overlay_tree_dir,*relpath)
fakemod_dir = os.path.join(fakemod_root,*(relpath[1:]))
os.makedirs(destdir)
for fn in os.listdir(srcdir):
@ -29,13 +29,13 @@ def overlay_setup(repo_root):
os.path.join(srcdir,fn),
os.path.join(destdir,link_fn) )
overlay_dir = get_overlay_dir(repo_root)
overlay_tree_dir = get_overlay_tree_dir(repo_root)
if not os.path.exists(os.path.join(overlay_dir,'mmgen','main.py')):
if not os.path.exists(os.path.join(overlay_tree_dir,'mmgen','main.py')):
fakemod_root = os.path.join(repo_root,'test','overlay','fakemods')
make_link = os.symlink if sys.platform == 'linux' else shutil.copy2
sys.stderr.write('Setting up overlay tree\n')
shutil.rmtree(overlay_dir,ignore_errors=True)
shutil.rmtree(overlay_tree_dir,ignore_errors=True)
for d in (
'mmgen',
'mmgen.contrib',
@ -64,4 +64,4 @@ def overlay_setup(repo_root):
'mmgen.wordlist' ):
process_srcdir(d)
return overlay_dir
return overlay_tree_dir

12
test/test.py
View file

@ -73,14 +73,14 @@ def create_shm_dir(data_dir,trash_dir):
import sys,os,time
from include.tests_header import repo_root
from test.overlay import get_overlay_dir,overlay_setup
from test.overlay import get_overlay_tree_dir,overlay_setup
overlay_dir = get_overlay_dir(repo_root)
sys.path.insert(0,overlay_dir)
overlay_tree_dir = get_overlay_tree_dir(repo_root)
sys.path.insert(0,overlay_tree_dir)
if sys.argv[-1] == 'clean':
from shutil import rmtree
rmtree(overlay_dir,ignore_errors=True)
rmtree(overlay_tree_dir,ignore_errors=True)
else:
# overlay must be set up before importing mmgen mods!
overlay_setup(repo_root)
@ -297,8 +297,8 @@ def clean(usr_dirs=None,clean_overlay=True):
iqmsg(green(f'Cleaned directories {data_dir!r} {trash_dir!r}'))
if clean_overlay:
cleandir(overlay_dir)
iqmsg(green(f'Cleaned directory {os.path.relpath(overlay_dir)!r}'))
cleandir(overlay_tree_dir)
iqmsg(green(f'Cleaned directory {os.path.relpath(overlay_tree_dir)!r}'))
def create_tmp_dirs(shm_dir):
if g.platform == 'win':