From 9f29b248053f832c861f14fa10bb916503ab4047 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 4 Apr 2016 18:12:27 +0200
Subject: [PATCH] tests: add tests for compose+add files

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #253
Approved by: cgwalters
---
 Makefile-tests.am                      |  1 +
 tests/compose/test-repo-add-files.json | 11 +++++++++
 tests/test-compose.sh                  | 31 +++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/compose/test-repo-add-files.json

diff --git a/Makefile-tests.am b/Makefile-tests.am
index e9a47913..49be14ab 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -42,6 +42,7 @@ tests/test-ucontainer.sh: tests/compose/test-repo-local.repo
 installed_test_data = tests/libtest.sh \
 	tests/compose/test-repo.repo \
 	tests/compose/test-repo.json \
+	tests/compose/test-repo-add-files.json \
 	tests/compose/test-repo.repo.in \
 	$(NULL)
 
diff --git a/tests/compose/test-repo-add-files.json b/tests/compose/test-repo-add-files.json
new file mode 100644
index 00000000..8facf57d
--- /dev/null
+++ b/tests/compose/test-repo-add-files.json
@@ -0,0 +1,11 @@
+{
+    "ref": "fedora/test",
+
+    "repos": ["test-repo"],
+
+    "selinux": false,
+
+    "packages": ["empty"],
+
+    "add-files": [["exported_file", "/exports/exported_file"]]
+}
diff --git a/tests/test-compose.sh b/tests/test-compose.sh
index 581ba568..037ddcd4 100755
--- a/tests/test-compose.sh
+++ b/tests/test-compose.sh
@@ -29,7 +29,7 @@ unset G_DEBUG
 
 (arch | grep -q x86_64) || { echo 1>&2 "$0 can be run only on x86_64"; echo "1..0" ; exit 77; }
 
-echo "1..1"
+echo "1..4"
 
 ostree init --repo=repo --mode=archive-z2
 
@@ -47,3 +47,32 @@ ostree --repo=repo refs >refs.txt
 assert_file_has_content refs.txt fedora/test
 
 echo "ok compose"
+
+# bring them in the current context so we can modify exported_file
+ln -s $SRCDIR/test-repo-add-files.json .
+ln -s $SRCDIR/test-repo.repo .
+
+echo hello > exported_file
+
+rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
+assert_has_file touched
+old_mtime=$(stat -c %y touched)
+ostree --repo=repo ls fedora/test /exports/exported_file | grep exported > exported.txt
+
+assert_file_has_content exported.txt "/exports/exported_file"
+assert_file_has_content exported.txt "0 0"
+ostree --repo=repo rev-parse fedora/test > oldref.txt
+rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
+new_mtime=$(stat -c %y touched)
+ostree --repo=repo rev-parse fedora/test > newref.txt
+assert_streq $(cat oldref.txt) $(cat newref.txt)
+assert_streq "$old_mtime" "$new_mtime"
+
+echo . >> exported_file
+rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
+new_mtime=$(stat -c %y touched)
+ostree --repo=repo rev-parse fedora/test > newref.txt
+assert_not_streq $(cat oldref.txt) $(cat newref.txt)
+assert_not_streq "$old_mtime" "$new_mtime"
+
+echo "ok compose add files"