SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Clean up remaining temporary directory setups

Browse Source 
This completes what 6b1df5f425 started.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2023-02-12 13:46:35 +01:00
parent f748c17023
commit 78084c05bb
6 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_build_system.py
View File

@ -26,8 +26,7 @@ from kas import kas
def test_build_system(changedir, tmpdir): def test_build_system(changedir, tmpdir):
tdir = str(tmpdir.mkdir('test_build_system')) tdir = str(tmpdir / 'test_build_system')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_build_system', tdir) shutil.copytree('tests/test_build_system', tdir)
os.chdir(tdir) os.chdir(tdir)

12
tests/test_environment_variables.py
View File

@ -29,8 +29,7 @@ from kas import kas
def test_build_dir_is_placed_inside_work_dir_by_default(changedir, tmpdir): def test_build_dir_is_placed_inside_work_dir_by_default(changedir, tmpdir):
conf_dir = str(tmpdir.mkdir('test_env_variables')) conf_dir = str(tmpdir / 'test_env_variables')
shutil.rmtree(conf_dir, ignore_errors=True)
shutil.copytree('tests/test_environment_variables', conf_dir) shutil.copytree('tests/test_environment_variables', conf_dir)
os.chdir(conf_dir) os.chdir(conf_dir)
@ -41,11 +40,9 @@ def test_build_dir_is_placed_inside_work_dir_by_default(changedir, tmpdir):
def test_build_dir_can_be_specified_by_environment_variable(changedir, tmpdir): def test_build_dir_can_be_specified_by_environment_variable(changedir, tmpdir):
conf_dir = str(tmpdir.mkdir('test_env_variables')) conf_dir = str(tmpdir / 'test_env_variables')
build_dir = str(tmpdir.mkdir('test_build_dir')) build_dir = str(tmpdir / 'test_build_dir')
shutil.rmtree(conf_dir, ignore_errors=True)
shutil.copytree('tests/test_environment_variables', conf_dir) shutil.copytree('tests/test_environment_variables', conf_dir)
shutil.rmtree(build_dir, ignore_errors=True)
os.chdir(conf_dir) os.chdir(conf_dir)
os.environ['KAS_BUILD_DIR'] = build_dir os.environ['KAS_BUILD_DIR'] = build_dir
@ -56,12 +53,11 @@ def test_build_dir_can_be_specified_by_environment_variable(changedir, tmpdir):
def _test_env_section_export(changedir, tmpdir, bb_env_var, bb_repo): def _test_env_section_export(changedir, tmpdir, bb_env_var, bb_repo):
conf_dir = pathlib.Path(str(tmpdir.mkdir('test_env_variables'))) conf_dir = pathlib.Path(str(tmpdir / 'test_env_variables'))
env_out = conf_dir / 'env_out' env_out = conf_dir / 'env_out'
bb_env_out = conf_dir / 'bb_env_out' bb_env_out = conf_dir / 'bb_env_out'
init_build_env = conf_dir / 'oe-init-build-env' init_build_env = conf_dir / 'oe-init-build-env'
shutil.rmtree(str(conf_dir), ignore_errors=True)
shutil.copytree('tests/test_environment_variables', str(conf_dir)) shutil.copytree('tests/test_environment_variables', str(conf_dir))
os.chdir(str(conf_dir)) os.chdir(str(conf_dir))

3
tests/test_layers.py
View File

@ -31,8 +31,7 @@ LAYERBASE = '${TOPDIR}/..'
@pytest.fixture @pytest.fixture
def dokas(tmpdir): def dokas(tmpdir):
tdir = str(tmpdir.mkdir('test_layers')) tdir = str(tmpdir / 'test_layers')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_layers', tdir) shutil.copytree('tests/test_layers', tdir)
os.chdir(tdir) os.chdir(tdir)
kas.kas(['shell', 'test.yml', '-c', 'true']) kas.kas(['shell', 'test.yml', '-c', 'true'])

3
tests/test_menu.py
View File

@ -55,8 +55,7 @@ def check_bitbake_options(expected):
def test_menu(monkeypatch, tmpdir): def test_menu(monkeypatch, tmpdir):
tdir = str(tmpdir.mkdir('test_menu')) tdir = str(tmpdir / 'test_menu')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_menu', tdir) shutil.copytree('tests/test_menu', tdir)
cwd = os.getcwd() cwd = os.getcwd()
os.chdir(tdir) os.chdir(tdir)

6
tests/test_patch.py
View File

@ -27,8 +27,7 @@ from kas import kas
def test_patch(changedir, tmpdir): def test_patch(changedir, tmpdir):
tdir = str(tmpdir.mkdir('test_patch')) tdir = str(tmpdir / 'test_patch')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_patch', tdir) shutil.copytree('tests/test_patch', tdir)
cwd = os.getcwd() cwd = os.getcwd()
os.chdir(tdir) os.chdir(tdir)
@ -45,8 +44,7 @@ def test_patch_update(changedir, tmpdir):
a branch to a commit hash and vice-versa with both git and mercurial a branch to a commit hash and vice-versa with both git and mercurial
repositories. repositories.
""" """
tdir = str(tmpdir.mkdir('test_patch_update')) tdir = str(tmpdir / 'test_patch_update')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_patch', tdir) shutil.copytree('tests/test_patch', tdir)
cwd = os.getcwd() cwd = os.getcwd()
os.chdir(tdir) os.chdir(tdir)

9
tests/test_refspec.py
View File

@ -32,8 +32,7 @@ def test_refspec_switch(changedir, tmpdir):
Test that the local git clone is correctly updated when switching Test that the local git clone is correctly updated when switching
between a commit hash refspec and a branch refspec. between a commit hash refspec and a branch refspec.
""" """
tdir = str(tmpdir.mkdir('test_refspec_switch')) tdir = str(tmpdir / 'test_refspec_switch')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_refspec', tdir) shutil.copytree('tests/test_refspec', tdir)
os.chdir(tdir) os.chdir(tdir)
@ -71,8 +70,7 @@ def test_refspec_absolute(changedir, tmpdir):
Test that the local git clone works when a absolute refspec Test that the local git clone works when a absolute refspec
is given. is given.
""" """
tdir = str(tmpdir.mkdir('test_refspec_absolute')) tdir = str(tmpdir / 'test_refspec_absolute')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_refspec', tdir) shutil.copytree('tests/test_refspec', tdir)
os.chdir(tdir) os.chdir(tdir)
@ -94,8 +92,7 @@ def test_url_no_refspec(changedir, tmpdir):
""" """
Test that a repository with url but no refspec raises an error. Test that a repository with url but no refspec raises an error.
""" """
tdir = str(tmpdir.mkdir('test_url_no_refspec')) tdir = str(tmpdir / 'test_url_no_refspec')
shutil.rmtree(tdir, ignore_errors=True)
shutil.copytree('tests/test_refspec', tdir) shutil.copytree('tests/test_refspec', tdir)
os.chdir(tdir) os.chdir(tdir)
with pytest.raises(SystemExit): with pytest.raises(SystemExit):