summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-11-29 14:05:38 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-29 14:05:38 +0100
commit3d284148090b6349c216407bb2766bd8f6a962f0 (patch)
treef6196709e26ef6f4c8ffc37ba1b1f3622bbfdda0 /test/integration
parent321213f0dcdcdaab04e01663e7a047b261400c9c (diff)
tests: fix typos, correct helpmsgs and test tests
Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework10
-rwxr-xr-xtest/integration/test-apt-get-source7
2 files changed, 11 insertions, 6 deletions
diff --git a/test/integration/framework b/test/integration/framework
index ce10002ec..3e159f6a9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -574,7 +574,7 @@ setupsimplenativepackage() {
local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
If you find such a package installed on your system,
something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
local SECTION="${7:-others}"
local DISTSECTION
@@ -630,7 +630,7 @@ buildsimplenativepackage() {
local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
If you find such a package installed on your system,
something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
local SECTION="${7:-others}"
local PRIORITY="${8:-optional}"
@@ -812,7 +812,7 @@ insertpackage() {
local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASES}
If you find such a package installed on your system,
something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
local ARCHS=""
for RELEASE in $(printf '%s' "$RELEASES" | tr ',' '\n'); do
if [ "$RELEASE" = 'installed' ]; then
@@ -891,7 +891,7 @@ insertinstalledpackage() {
local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/installed
If you find such a package installed on your system,
something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
local FILE='rootdir/var/lib/dpkg/status'
local INFO='rootdir/var/lib/dpkg/info'
@@ -1197,7 +1197,7 @@ changetowebserver() {
fi
cd - > /dev/null
else
- msgdie 'You have to build aptwerbserver or install a webserver'
+ msgdie 'You have to build apt from source to have test/interactive-helper/aptwebserver available for tests requiring a webserver'
fi
if [ "$REWRTE" != 'yes' ]; then
rewritesourceslist "http://localhost:${APTHTTPPORT}/"
diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source
index 48a70277c..99777a530 100755
--- a/test/integration/test-apt-get-source
+++ b/test/integration/test-apt-get-source
@@ -27,7 +27,7 @@ insertsource 'stable' 'foo' 'all' '1.0'
insertsource 'wheezy' 'foo' 'all' '0.0.1'
insertsource 'wheezy' 'foo' 'all' '0.1'
-# the order of these versions is choosen to ensure that
+# the order of these versions is chosen to ensure that
# * apt will pick the one in the correct release, despite a higher version coming later and
# * apt will pick the highest version in a release, despite a lower version coming later.
# (bts #746412)
@@ -35,6 +35,11 @@ insertsource 'stable' 'baz' 'all' '1.0'
insertsource 'unstable' 'baz' 'all' '2.0'
insertsource 'unstable' 'baz' 'all' '1.5'
+# ensure we really have the situation we wanted (first 2.0 is foo above)
+testequal 'Version: 2.0
+Version: 2.0
+Version: 1.5' grep '^Version:' aptarchive/dists/unstable/main/source/Sources
+
insertsource 'stable' 'bar' 'any' '1.1' 'Vcs-Browser: https://anonscm.debian.org/cgit/bar/bar.git
Vcs-Git: git://anonscm.debian.org/bar/bar.git -b debian/experimental'