test: Add (failing) test for holocm#24

test/14-silent-apply/README.md

@@ -0,0 +1,4 @@
+It is desirable that if a user has manually altered a file, but in a
+way that is identical to the way that `holo apply` would have altered
+it, that holo should accept this change, rather than making the user
+first revert it, only to make the same change again.

test/14-silent-apply/expected-apply-output

@@ -0,0 +1 @@
+exit status 0

test/14-silent-apply/expected-diff-output

@@ -0,0 +1,9 @@
+diff --holo target/var/lib/holo/files/provisioned/etc/normal.conf target/etc/normal.conf
+--- target/var/lib/holo/files/provisioned/etc/normal.conf
++++ target/etc/normal.conf
+@@ -1,2 +1,2 @@
+-bbb
+-bbb
++ccc
++ccc
+exit status 0

test/14-silent-apply/expected-scan-output

@@ -0,0 +1,6 @@
+
+file:target/etc/normal.conf
+    store at target/var/lib/holo/files/base/etc/normal.conf
+       apply target/usr/share/holo/files/01-first/etc/normal.conf
+
+exit status 0

test/14-silent-apply/expected-tree

@@ -0,0 +1,16 @@
+>> ./etc/holorc = symlink
+../../../holorc
+>> ./etc/normal.conf = regular
+ccc
+ccc
+>> ./run = dir
+>> ./tmp = dir
+>> ./usr/share/holo/files/01-first/etc/normal.conf = regular
+ccc
+ccc
+>> ./var/lib/holo/files/base/etc/normal.conf = regular
+aaa
+aaa
+>> ./var/lib/holo/files/provisioned/etc/normal.conf = regular
+ccc
+ccc

test/14-silent-apply/source/etc/holorc

@@ -0,0 +1 @@
+../../../holorc

test/14-silent-apply/source/etc/normal.conf

@@ -0,0 +1,2 @@
+ccc
+ccc

test/14-silent-apply/source/usr/share/holo/files/01-first/etc/normal.conf

@@ -0,0 +1,2 @@
+ccc
+ccc

test/14-silent-apply/source/var/lib/holo/files/base/etc/normal.conf

@@ -0,0 +1,2 @@
+aaa
+aaa

test/14-silent-apply/source/var/lib/holo/files/provisioned/etc/normal.conf

@@ -0,0 +1,2 @@
+bbb
+bbb