Merge ~seb128/utah:without-desktop-rename into utah:master
Proposed by
Sebastien Bacher
Status: | Needs review |
---|---|
Proposed branch: | ~seb128/utah:without-desktop-rename |
Merge into: | utah:master |
Diff against target: |
175 lines (+57/-12) 2 files modified
utah/isotest/data/file_list_udi (+18/-0) utah/isotest/iso_static_validation.py (+39/-12) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UTAH Dev | Pending | ||
Review via email: mp+436867@code.launchpad.net |
Commit message
Alternative to https:/
To post a comment you must log in.
Thanks Seb for working on this! To support your work, I've tested this PR but a few changes were needed to make all of the tests pass. With the following changes, here is my local test log showing all passing tests: https:/ /pastebin. ubuntu. com/p/mW8xNfj3s v/
The only remaining strange thing is that all of the utah*.deb files are put in two places: just outside the root utah directory (as is usual), and then also inside the utah directory but it's not clear to me why they are duplicated. I've just been ignoring the debs inside the utah directory, when building/ installing/ testing.
Here are the test changes previously mentioned:
1) The change to test_run_ utah_tests. py fixes an issue in python 3.11 where 'U' is deprecated.
diff --git a/tests/ test_run_ utah_tests. py b/tests/ test_run_ utah_tests. py test_run_ utah_tests. py test_run_ utah_tests. py join(os. path.dirname( __file_ _), module( 'run_utah_ tests',
open( server_ script_ path),
server_ script_ path,
index 4c756b40..419c1e68 100644
--- a/tests/
+++ b/tests/
@@ -29,7 +29,7 @@ server_script_path = os.path.
server_script = imp.load_
- ('.py', 'U', 1))
+ ('.py', 'r', 1))
2) A change to iso_static_ validation. py to fix the cdimage url used for comparison. Without this change, pointing to a lunar desktop iso generates a file not found error (because self.st_variant was not getting set to equal st_variant): cdimage. ubuntu. com/daily- legacy/ pending/ lunar-desktop- amd64.manifest': HTTP Error 404: Not Found
ERROR: Failed to fetch URL 'http://
diff --git a/utah/ isotest/ iso_static_ validation. py b/utah/ isotest/ iso_static_ validation. py isotest/ iso_static_ validation. py isotest/ iso_static_ validation. py (unittest. TestCase) : self.iso_ location, logger=logging)
self. st_release = self.iso.series
self. st_variant = self.iso. installtype
self. st_variant = "desktop-legacy"
self. st_arch = self.iso.arch
index 9123813c..e220a7b9 100755
--- a/utah/
+++ b/utah/
@@ -176,7 +176,7 @@ class TestValidateISO
self.iso = ISO(image=
- if self.st_variant == "desktop" and self.st_release > "kinetic":
+ if self.st_variant == "desktop" and self.st_release < "lunar":
3) Another change to iso_static_ validation. py to remove the .git folder from the secure boot test before doing the sparse checkout, otherwise the test fails because the git checkout fails to reinitialize the git repo.
@@ -563,6 +563,9 @@ class TestValidateISO (unittest. TestCase) :
git_ keys.pull( ) join(repo_ dir, '.git') rmtree( keys_dot_ git)
git_ keys.sparse_ checkout( paths=[ keys_repo_ path]) Popen(cmd, stdout= subprocess. PIPE,
# so we just pull to ensure it is up to date
else:
+ # Remove .git folder before the sparse checkout
+ keys_dot_git = os.path.
+ shutil.
cmd = ["make", "-C", keys]
output = subprocess.