From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 25 Aug 2014 13:56:50 +0000 (-0400)
Subject: tests: Copy the download cache when available [v2]
X-Git-Tag: lxc-1.1.0.alpha2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57221f67feb3b7ef23bba9a34a21640ce792ee09;p=thirdparty%2Flxc.git

tests: Copy the download cache when available [v2]

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 6242c5fd8..59c264032 100755
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -114,6 +114,12 @@ else
 	done
 fi
 
+# Copy the download template cache if available
+run_cmd mkdir -p $HDIR/.cache/lxc
+[ -d /var/cache/lxc/download ] && \
+    cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \
+    chown -R $TUSER: $HDIR/.cache/lxc
+
 run_cmd lxc-create -t download -n c1 -- -d ubuntu -r trusty -a $ARCH
 run_cmd lxc-start -n c1 -d
 
diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 395c45347..7955d4f65 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -109,6 +109,13 @@ fi
 mkdir -p /run/user/$(id -u usernic-user)
 chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user
 
+# Copy the download template cache if available
+run_cmd "mkdir -p /home/usernic-user/.cache/lxc"
+[ -d /var/cache/lxc/download ] && \
+    cp -R /var/cache/lxc/download /home/usernic-user/.cache/lxc && \
+    chown -R usernic-user: /home/usernic-user/.cache/lxc
+
+
 # Create two test bridges
 brctl addbr usernic-br0
 brctl addbr usernic-br1