summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-06-09 18:58:34 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-06-09 19:06:12 +0200
commitb2ea1a47531266377abe4f12c6f21417ea96eea0 (patch)
tree8aacdd7ad522b9126b24837fc4a2b43a3a90cc64 /test
parent2128d3fce44da34ecb1f0d784b703807f66b20f9 (diff)
ensure state-dir exists before coyping cdrom files
We do the same in the acquire system which handles the 'normal' downloads, so do it here as well even though its unlikely anyone will ever notice (beside testcases of course …)
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework8
-rwxr-xr-xtest/integration/test-apt-cdrom2
2 files changed, 6 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 7c2aed592..5c50498a2 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -692,9 +692,11 @@ setupaptarchive() {
setupflataptarchive
fi
signreleasefiles
- msgninfo "\tSync APT's cache with the archive… "
- aptget update -qq
- msgdone "info"
+ if [ "$1" != '--no-update' ]; then
+ msgninfo "\tSync APT's cache with the archive… "
+ aptget update -qq
+ msgdone "info"
+ fi
}
signreleasefiles() {
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 3394aa505..6e3533152 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture 'amd64' 'i386'
buildsimplenativepackage 'testing' 'amd64,i386' '0.8.15' 'stable'
-setupaptarchive
+setupaptarchive --no-update
changetocdrom 'Debian APT Testdisk 0.8.15'