endlessm · starnight · Sep 12, 2024 · Sep 10, 2024 · Sep 8, 2024 · Sep 5, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Define hexdump textconv with "git config diff.efivars.textconv hd"
+tests/efivars/* diff=efivars
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -17,6 +17,8 @@ TESTS = \
 EXTRA_DIST = \
 	$(TESTS) \
 	__init__.py \
+	conftest.py \
+	efivars \
 	test_image_boot.py \
 	test_live_storage.py \
 	test_migrate_chromium_profile.py \

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,28 @@
+# Copyright 2024 Endless OS Foundation LLC
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# pytest fixtures
+
+import pytest
+from shutil import copyfile, copytree
+
+from .util import EFIVARFS_PATH
+
+
+@pytest.fixture
+def efivarfs(tmp_path, monkeypatch):
+    """Temporary efivarfs data
+
+    Copy the test efivarfs data to a temporary location. The environment
+    variable EFIVARFS_PATH is set to the temporary location. This is supported
+    by libefivar.
+    """
+    # Only the data is copied in case EFIVARFS_PATH is read only like
+    # during distcheck. None of the metadata matters here.
+    tmp_efivarfs = tmp_path / 'efivars'
+    copytree(EFIVARFS_PATH, tmp_efivarfs, copy_function=copyfile)
+
+    # libefivar expects this to end with a trailing /.
+    monkeypatch.setenv('EFIVARFS_PATH', f'{tmp_efivarfs}/')
+
+    return tmp_efivarfs
diff --git a/tests/efivars/Boot0000-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Boot0000-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Boot0001-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Boot0001-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Boot0002-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Boot0002-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Boot0003-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Boot0003-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/BootCurrent-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/BootCurrent-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/BootOptionSupport-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/BootOptionSupport-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/BootOrder-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/BootOrder-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ConIn-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ConIn-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ConInDev-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ConInDev-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ConOut-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ConOut-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ConOutDev-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ConOutDev-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ErrOut-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ErrOut-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/ErrOutDev-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/ErrOutDev-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/FALLBACK_VERBOSE-605dab50-e046-4300-abb6-3dd810dd8b23 b/tests/efivars/FALLBACK_VERBOSE-605dab50-e046-4300-abb6-3dd810dd8b23
diff --git a/tests/efivars/KEK-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/KEK-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Key0000-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Key0000-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Key0001-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Key0001-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Lang-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Lang-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/LangCodes-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/LangCodes-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/MTC-eb704011-1402-11d3-8e77-00a0c969723b b/tests/efivars/MTC-eb704011-1402-11d3-8e77-00a0c969723b
diff --git a/tests/efivars/MokListRT-605dab50-e046-4300-abb6-3dd810dd8b23 b/tests/efivars/MokListRT-605dab50-e046-4300-abb6-3dd810dd8b23
diff --git a/tests/efivars/MokListTrustedRT-605dab50-e046-4300-abb6-3dd810dd8b23 b/tests/efivars/MokListTrustedRT-605dab50-e046-4300-abb6-3dd810dd8b23
diff --git a/tests/efivars/MokListXRT-605dab50-e046-4300-abb6-3dd810dd8b23 b/tests/efivars/MokListXRT-605dab50-e046-4300-abb6-3dd810dd8b23
diff --git a/tests/efivars/OsIndicationsSupported-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/OsIndicationsSupported-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/PK-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/PK-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/PlatformLang-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/PlatformLang-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/PlatformLangCodes-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/PlatformLangCodes-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/PlatformRecovery0000-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/PlatformRecovery0000-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/SbatLevelRT-605dab50-e046-4300-abb6-3dd810dd8b23 b/tests/efivars/SbatLevelRT-605dab50-e046-4300-abb6-3dd810dd8b23
diff --git a/tests/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/SignatureSupport-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/SignatureSupport-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/Timeout-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/Timeout-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/VarErrorFlag-04b37fe8-f6ae-480b-bdd5-37d98c5e89aa b/tests/efivars/VarErrorFlag-04b37fe8-f6ae-480b-bdd5-37d98c5e89aa
diff --git a/tests/efivars/VendorKeys-8be4df61-93ca-11d2-aa0d-00e098032b8c b/tests/efivars/VendorKeys-8be4df61-93ca-11d2-aa0d-00e098032b8c
diff --git a/tests/efivars/certdb-d9bee56e-75dc-49d9-b4d7-b534210f637a b/tests/efivars/certdb-d9bee56e-75dc-49d9-b4d7-b534210f637a
diff --git a/tests/efivars/certdbv-d9bee56e-75dc-49d9-b4d7-b534210f637a b/tests/efivars/certdbv-d9bee56e-75dc-49d9-b4d7-b534210f637a
diff --git a/tests/efivars/db-d719b2cb-3d3a-4596-a3bc-dad00e67656f b/tests/efivars/db-d719b2cb-3d3a-4596-a3bc-dad00e67656f
diff --git a/tests/util.py b/tests/util.py
@@ -2,10 +2,13 @@
 import importlib.machinery
 import importlib.util
 import os
+from pathlib import Path
 import subprocess
 import tempfile
 import unittest
 
+TESTS_PATH = Path(__file__).parent.resolve()
+EFIVARFS_PATH = TESTS_PATH / 'efivars'
 
 run_needs_root_tests = bool(os.environ.get('EBH_ROOT_TESTS'))
 needs_root = unittest.skipIf(not run_needs_root_tests,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Define hexdump textconv with "git config diff.efivars.textconv hd"
		tests/efivars/* diff=efivars
Copy link Member wjt Sep 11, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. `+++ b/tests/efivars/PlatformLangCodes-8be4df61-93ca-11d2-aa0d-00e098032b8c @@ -0,0 +1,3 @@ +00000000 06 00 00 00 65 6e 3b 66 72 3b 65 6e 2d 55 53 3b \|....en;fr;en-US;\| +00000010 66 72 2d 46 52 00 \|fr-FR.\| +00000016` Interesting, I wonder where French came from? Copy link Member Author dbnicholson Sep 11, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. 🤷 This comes from TianoCore (EDK2), so my guess is someone bothered to do French translations for it. Yeah, now I see some translations.