nfpm: fix util_rule tests

pantsbuild · Jan 2, 2025 · 381ceb8 · 381ceb8
1 parent 755cde1
commit 381ceb8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/python/pants/backend/nfpm/util_rules/generate_config_test.py b/src/python/pants/backend/nfpm/util_rules/generate_config_test.py
@@ -267,7 +267,7 @@ def get_digest(rule_runner: RuleRunner, source_files: dict[str, str]) -> Digest:
             NfpmApkPackageFieldSet,
             ["contents:dummy_package"],
             {},
-            ["output_path/package"],
+            ["dummy", "output_path/package"],
             {},
             None,
             id="apk-with-pkg-dep",
@@ -277,7 +277,7 @@ def get_digest(rule_runner: RuleRunner, source_files: dict[str, str]) -> Digest:
             NfpmArchlinuxPackageFieldSet,
             ["contents:dummy_package"],
             {},
-            ["output_path/package"],
+            ["dummy", "output_path/package"],
             {},
             None,
             id="archlinux-with-pkg-dep",
@@ -287,7 +287,7 @@ def get_digest(rule_runner: RuleRunner, source_files: dict[str, str]) -> Digest:
             NfpmDebPackageFieldSet,
             ["contents:dummy_package"],
             {},
-            ["output_path/package"],
+            ["dummy", "output_path/package"],
             {},
             None,
             id="deb-with-pkg-dep",
@@ -297,7 +297,7 @@ def get_digest(rule_runner: RuleRunner, source_files: dict[str, str]) -> Digest:
             NfpmRpmPackageFieldSet,
             ["contents:dummy_package"],
             {},
-            ["output_path/package"],
+            ["dummy", "output_path/package"],
             {},
             None,
             id="rpm-with-pkg-dep",
@@ -307,7 +307,7 @@ def get_digest(rule_runner: RuleRunner, source_files: dict[str, str]) -> Digest:
             NfpmRpmPackageFieldSet,
             ["contents:dummy_package"],
             {},
-            ["output_path/package"],
+            ["dummy", "output_path/package"],
             {"ghost_contents": ["/var/log/pkg.log"]},
             None,
             id="rpm-with-pkg-dep-and-ghost",
@@ -528,8 +528,9 @@ def test_generate_nfpm_yaml(
                     dst="/etc/{_PKG_NAME}",
                     file_mode=0o700,
                 )
-                target(
+                file(
                     name="dummy",
+                    source="dummy",
                     # For this test, the dummy target should be
                     # treated as if it were a package that defines:
                     # output_path="output_path/package"
@@ -542,7 +543,7 @@ def test_generate_nfpm_yaml(
                     dependencies=[":dummy"],
                     # NOTE: src pointing to package dep is relative to
                     # the build_root instead of this BUILD file.
-                    src="ouptut_path/package",
+                    src="output_path/package",
                     dst="/usr/bin/dummy_package",
                     file_mode=0o550,
                 )
@@ -699,6 +700,14 @@ def test_generate_nfpm_yaml(
             entry = contents_by_dst.pop(dst)
             assert "ghost" == entry["type"]
 
+    if "contents:dummy_package" in dependencies:
+        assert "dummy" not in contents_by_dst
+        dst = "/usr/bin/dummy_package"
+        assert dst in contents_by_dst
+        entry = contents_by_dst.pop(dst)
+        assert "" == entry["type"]
+        assert 0o0550 == entry["file_info"]["mode"]
+
     # make sure all contents have been accounted for (popped off above)
     assert len(contents_by_dst) == 0
 

diff --git a/src/python/pants/backend/nfpm/util_rules/sandbox_test.py b/src/python/pants/backend/nfpm/util_rules/sandbox_test.py
@@ -493,7 +493,7 @@ def test_populate_nfpm_content_sandbox(
                     name="output_path_package",
                     src="relative_to_build_root.tar",
                     dst="/opt/foo/relative_to_build_root.tar",
-                    dependencies=[":archive"],
+                    dependencies=[":output_path_archive"],
                 )
                 """
             ),