Merge pull request #7306 from freedomofpress/stg-platform-noble

Expand some testinfra checks to expect noble
freedomofpress · Nov 8, 2024 · 5e9865a · 5e9865a
2 parents a670288 + dbda055
commit 5e9865a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/molecule/testinfra/common/test_automatic_updates.py b/molecule/testinfra/common/test_automatic_updates.py
@@ -147,9 +147,11 @@ def test_unattended_upgrades_functional(host):
     """
     c = host.run("sudo unattended-upgrades --dry-run --debug")
     assert c.rc == 0
+    distro = host.system_info.codename
     expected_origins = (
-        "Allowed origins are: origin=Ubuntu,archive=focal, origin=Ubuntu,archive=focal-security"
-        ", origin=Ubuntu,archive=focal-updates, origin=SecureDrop,codename=focal"
+        f"Allowed origins are:"
+        f" origin=Ubuntu,archive={distro}, origin=Ubuntu,archive={distro}-security"
+        f", origin=Ubuntu,archive={distro}-updates, origin=SecureDrop,codename={distro}"
     )
     expected_result = (
         "No packages found that can be upgraded unattended and no pending auto-removals"

diff --git a/molecule/testinfra/common/test_platform.py b/molecule/testinfra/common/test_platform.py
@@ -15,9 +15,9 @@ def test_ansible_version(host):
 
 def test_platform(host):
     """
-    SecureDrop requires Ubuntu 20.04 LTS
+    SecureDrop requires Ubuntu 20.04 (focal) or 24.04 (noble)
     """
     assert host.system_info.type == "linux"
     assert host.system_info.distribution == "ubuntu"
-    assert host.system_info.codename == "focal"
-    assert host.system_info.release == "20.04"
+    version = (host.system_info.codename, host.system_info.release)
+    assert version in {("focal", "20.04"), ("noble", "24.04")}