Beef of content addressing test

obsidiansystems · Dec 11, 2023 · 7d7a2a3 · 7d7a2a3
1 parent 17c8d51
commit 7d7a2a3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/t/content-addressed/basic.t b/t/content-addressed/basic.t
@@ -27,7 +27,7 @@ my $project = $db->resultset('Projects')->create({name => "tests", displayname =
 my $jobset = createBaseJobset("content-addressed", "content-addressed.nix", $ctx{jobsdir});
 
 ok(evalSucceeds($jobset), "Evaluating jobs/content-addressed.nix should exit with return code 0");
-is(nrQueuedBuildsForJobset($jobset), 4, "Evaluating jobs/content-addressed.nix should result in 4 builds");
+is(nrQueuedBuildsForJobset($jobset), 5, "Evaluating jobs/content-addressed.nix should result in 4 builds");
 
 for my $build (queuedBuildsForJobset($jobset)) {
     ok(runBuild($build), "Build '".$build->job."' from jobs/content-addressed.nix should exit with code 0");

diff --git a/t/jobs/content-addressed.nix b/t/jobs/content-addressed.nix
@@ -18,10 +18,17 @@ rec {
       builder = ./succeed-with-failed.sh;
     };
 
+  caDependingOnCA =
+    cfg.mkContentAddressedDerivation {
+      name = "ca-depending-on-ca";
+      builder = ./dir-with-file-builder.sh;
+      FOO = empty_dir;
+    };
+
   nonCaDependingOnCA =
     cfg.mkDerivation {
       name = "non-ca-depending-on-ca";
-      builder = ./empty-dir-builder.sh;
+      builder = ./dir-with-file-builder.sh;
       FOO = empty_dir;
     };
 }

diff --git a/t/jobs/dir-with-file-builder.sh b/t/jobs/dir-with-file-builder.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+# Workaround for https://github.com/NixOS/nix/pull/6051
+echo "some output"
+
+mkdir $out
+echo foo > $out/a-file