summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-13 19:31:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-13 19:31:40 +0000
commit4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81 (patch)
tree8f4f0bd9208e7e7f514c0683f1f18583352f2b2e /test/integration
parentReleasing progress-linux version 2.9.4-0.0~progress7.99u1. (diff)
downloadapt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.tar.xz
apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.zip
Merging upstream version 2.9.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-xtest/integration/run-tests2
-rwxr-xr-xtest/integration/test-bug-64141-install-dependencies-for-on-hold3
-rwxr-xr-xtest/integration/test-prefer-higher-priority-providers9
-rwxr-xr-xtest/integration/test-resolver-provider-exchange1
4 files changed, 9 insertions, 6 deletions
diff --git a/test/integration/run-tests b/test/integration/run-tests
index 3100e8e..331adfc 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -31,7 +31,7 @@ while [ -n "$1" ]; do
elif [ "$1" = '--only' ]; then
TESTLIST="$2"
shift
- elif [ -x "$1" ]; then
+ elif [ -e "$1" ]; then
TESTTORUN="$1"
else
echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
index 2565c94..1ad1952 100755
--- a/test/integration/test-bug-64141-install-dependencies-for-on-hold
+++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -5,6 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
configarchitecture 'native' 'strange-arch'
+native=$(getarchitecture 'native')
insertpackage 'unstable' 'unrelated' 'strange-arch' '1'
@@ -33,7 +34,7 @@ After this operation, 0 B of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only --solver 3.0
testfailure aptget dist-upgrade --trivial-only --solver 3.0 -o debug::apt::solver=2
-testsuccess grep -Fx 'Branch failed: Conflict: apt:amd64 -> apt:amd64=0.8.10 -> not oldcrap:amd64=1-1 but oldcrap:amd64 -> oldcrap:amd64=1-1' rootdir/tmp/testfailure.output
+testsuccess grep -Fx "Branch failed: Conflict: apt:$native -> apt:$native=0.8.10 -> not oldcrap:$native=1-1 but oldcrap:$native -> oldcrap:$native=1-1" rootdir/tmp/testfailure.output
allowremovemanual
diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
index 6f07db5..5fed20a 100755
--- a/test/integration/test-prefer-higher-priority-providers
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -5,6 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
configarchitecture 'native'
+native=$(getarchitecture 'native')
insertpackage 'unstable' 'foo' 'all' '1' 'Provides: stuff' 'important'
insertpackage 'unstable' 'bar' 'all' '1' 'Provides: stuff' 'optional'
@@ -90,10 +91,10 @@ Inst awesome (1 unstable [all])
Conf baz (1 unstable [all])
Conf awesome (1 unstable [all])" aptget install awesome foo- bar- -s
-testfailuremsg "E: Unsatisfiable dependency: awesome:amd64=1 -> foo:amd64=1 | bar:amd64=1 | baz:amd64=1
-E: Not considered: foo:amd64=1: not foo:amd64 -> not foo:amd64=1
-E: Not considered: bar:amd64=1: not bar:amd64 -> not bar:amd64=1
-E: Not considered: baz:amd64=1: not baz:amd64 -> not baz:amd64=1" aptget install awesome foo- bar- baz- -s --solver 3.0
+testfailuremsg "E: Unsatisfiable dependency: awesome:$native=1 -> foo:$native=1 | bar:$native=1 | baz:$native=1
+E: Not considered: foo:$native=1: not foo:$native -> not foo:$native=1
+E: Not considered: bar:$native=1: not bar:$native -> not bar:$native=1
+E: Not considered: baz:$native=1: not baz:$native -> not baz:$native=1" aptget install awesome foo- bar- baz- -s --solver 3.0
testfailureequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
diff --git a/test/integration/test-resolver-provider-exchange b/test/integration/test-resolver-provider-exchange
index 45d9369..2874b88 100755
--- a/test/integration/test-resolver-provider-exchange
+++ b/test/integration/test-resolver-provider-exchange
@@ -8,6 +8,7 @@ allowremovemanual
configarchitecture 'amd64'
insertinstalledpackage 'fuse' 'all' '2'
+insertpackage 'unstable' 'fuse' 'all' '2'
insertpackage 'unstable' 'fuse3' 'all' '3' 'Conflicts: fuse
Provides: fuse'