Skip to content
Snippets Groups Projects
Commit 4bf382d0 authored by Ashwin Kumar Karnad's avatar Ashwin Kumar Karnad
Browse files

fix tests and make log file if they dont exists

parent 747a57d6
No related branches found
No related tags found
1 merge request!29Restructure log location
Pipeline #370018 passed
This commit is part of merge request !29. Comments created here will be created in the context of that merge request.
......@@ -671,7 +671,11 @@ def install_environment(
_, build_log_file_name = create_log_file_names(
mpsd_release, mpsd_microarch, "install", toolchain=toolchain
)
build_log_file = release_base_dir / "logs" / build_log_file_name
build_log_folder = release_base_dir / "logs"
build_log_file = build_log_folder / build_log_file_name
# if logs folder dosent exist, create it
if not os.path.exists(build_log_folder):
os.makedirs(build_log_folder)
logging.info(f"Installing toolchain {toolchain} to {toolchain_dir}")
......
......@@ -227,7 +227,7 @@ def test_install_environment_zlib():
script_dir.mkdir(exist_ok=True, parents=True)
mpsd_release_to_test = "dev-23a"
toolchain_to_test = "global_generic"
mpsd_microarch = os.getenv("MPSD_MICROARCH", "UNKNOWN_MICROARCH")
mpsd_microarch = mod.get_native_microarchitecture()
release_base_dir = script_dir / mpsd_release_to_test
create_mock_git_repository(target_directory=script_dir, create_directory=False)
mod.prepare_environment(mpsd_release=mpsd_release_to_test, script_dir=(script_dir))
......@@ -280,9 +280,10 @@ def test_install_environment_zlib():
# release_base_dir/mpsd_microarch
# print("Debug here ")
# time.sleep(10)
build_log = list(
(release_base_dir / mpsd_microarch / "logs").glob(
f"{mpsd_release_to_test}_{toolchain_to_test}_*.log"
(release_base_dir / "logs").glob(
f"{mpsd_release_to_test}_{mpsd_microarch}_*_install.log"
)
)
assert len(build_log) > 0
......@@ -292,7 +293,7 @@ def test_install_environment_zlib():
with open(build_log, "r") as f:
lines = f.read()
assert "##### Installation finished" in lines
build_log_file_name = os.path.basename(build_log)
os.path.basename(build_log)
# assert that install log files exists
assert os.path.exists(release_base_dir / "install.log")
......@@ -302,8 +303,7 @@ def test_install_environment_zlib():
with open(release_base_dir / "install.log", "r") as f:
lines = f.read()
assert (
f"installing {toolchain_to_test} and logging at logs/{build_log_file_name}"
in lines
f"installing {toolchain_to_test} and logging at {str(build_log)}" in lines
)
# assert that the module files are created correctly
assert os.path.exists(release_base_dir / mpsd_microarch)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment