From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 4 Oct 2023 08:46:39 +0000 (+0200)
Subject: Stop explicitly setting distribution in tests
X-Git-Tag: v18~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1951%2Fhead;p=thirdparty%2Fmkosi.git

Stop explicitly setting distribution in tests

We now default to "custom" when we can't figure out the host
distribution instead of failing so let's stop explicitly setting
the distribution in tests.
---

diff --git a/tests/test_config.py b/tests/test_config.py
index dfabdada3..aa0ecbfd4 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -216,7 +216,6 @@ def test_parse_config(tmp_path: Path) -> None:
 
 
 def test_parse_load_verb(tmp_path: Path) -> None:
-    (tmp_path / "mkosi.conf").write_text("[Distribution]\nDistribution=fedora")
     with chdir(tmp_path):
         assert parse_config(["build"])[0].verb == Verb.build
         assert parse_config(["clean"])[0].verb == Verb.clean
@@ -255,24 +254,8 @@ def test_parse_config_files_filter(tmp_path: Path) -> None:
         confd = Path("mkosi.conf.d")
         confd.mkdir()
 
-        (confd / "10-file.conf").write_text(
-            """\
-            [Distribution]
-            Distribution=fedora
-
-            [Content]
-            Packages=yes
-            """
-        )
-        (confd / "20-file.noconf").write_text(
-            """\
-            [Distribution]
-            Distribution=fedora
-
-            [Content]
-            Packages=yes
-            """
-        )
+        (confd / "10-file.conf").write_text("[Content]\nPackages=yes")
+        (confd / "20-file.noconf").write_text("[Content]\nPackages=nope")
 
         _, [config] = parse_config()
         assert config.packages == ["yes"]
@@ -280,7 +263,7 @@ def test_parse_config_files_filter(tmp_path: Path) -> None:
 
 def test_compression(tmp_path: Path) -> None:
     with chdir(tmp_path):
-        _, [config] = parse_config(["--format", "disk", "--compress-output", "False", "--distribution", "fedora"])
+        _, [config] = parse_config(["--format", "disk", "--compress-output", "False"])
         assert config.compress_output == Compression.none
 
 
@@ -487,9 +470,6 @@ def test_match_imageversion(tmp_path: Path, op: str, version: str) -> None:
         parent = Path("mkosi.conf")
         parent.write_text(
             """\
-            [Distribution]
-            Distribution=fedora
-
             [Output]
             ImageId=testimage
             ImageVersion=123
@@ -546,24 +526,11 @@ def test_package_manager_tree(tmp_path: Path, skel: Optional[Path], pkgmngr: Opt
     with chdir(tmp_path):
         config = Path("mkosi.conf")
         with config.open("w") as f:
-            f.write(
-                """
-                [Distribution]
-                Distribution=fedora
-
-                [Content]
-                """
-            )
+            f.write("[Content]\n")
             if skel is not None:
-                f.write(f"""
-                SkeletonTrees={skel}
-                """
-            )
+                f.write(f"SkeletonTrees={skel}\n")
             if pkgmngr is not None:
-                f.write(f"""
-                PackageManagerTrees={pkgmngr}
-                """
-            )
+                f.write(f"PackageManagerTrees={pkgmngr}\n")
 
         _, [conf] = parse_config()
 
@@ -598,9 +565,6 @@ def test_wrong_section_warning(
         Path("mkosi.conf").write_text(
             "\n".join(
                 f"""\
-                [Distribution]
-                Distribution=fedora
-
                 [{section}]
                 ImageId=testimage
                 """