diff options
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 13 | ||||
| -rwxr-xr-x | test/integration/test-00-commands-have-help | 2 | ||||
| -rwxr-xr-x | test/integration/test-external-installation-planner-protocol (renamed from test/integration/test-external-installation-planer-protocol) | 26 |
3 files changed, 21 insertions, 20 deletions
diff --git a/test/integration/framework b/test/integration/framework index cd8597f80..795731deb 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -191,7 +191,7 @@ aptitude() { runapt aptitude "$@"; } aptextracttemplates() { runapt apt-extracttemplates "$@"; } aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; } aptdumpsolver() { runapt "${APTDUMPSOLVER}" "$@"; } -aptinternalplaner() { runapt "${APTINTERNALPLANER}" "$@"; } +aptinternalplanner() { runapt "${APTINTERNALPLANNER}" "$@"; } dpkg() { "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@" @@ -290,7 +290,7 @@ setupenvironment() { APTWEBSERVERBINDIR="${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}" APTINTERNALSOLVER="${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"}" APTDUMPSOLVER="${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/apt-dump-solver"}" - APTINTERNALPLANER="${APT_INTEGRATION_TESTS_INTERNAL_PLANER:-"${BUILDDIRECTORY}/apt-internal-planer"}" + APTINTERNALPLANNER="${APT_INTEGRATION_TESTS_INTERNAL_PLANNER:-"${BUILDDIRECTORY}/apt-internal-planner"}" test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- @@ -304,13 +304,13 @@ setupenvironment() { mkdir -p usr/lib/apt ln -s "${METHODSDIR}" usr/lib/apt/methods if [ "$BUILDDIRECTORY" = "$LIBRARYPATH" ]; then - mkdir -p usr/lib/apt/solvers usr/lib/apt/planers + mkdir -p usr/lib/apt/solvers usr/lib/apt/planners ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/solvers/dump - ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/planers/dump + ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/planners/dump ln -s "${BUILDDIRECTORY}/apt-internal-solver" usr/lib/apt/solvers/apt - ln -s "${BUILDDIRECTORY}/apt-internal-planer" usr/lib/apt/planers/apt + ln -s "${BUILDDIRECTORY}/apt-internal-planner" usr/lib/apt/planners/apt echo "Dir::Bin::Solvers \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/solvers\";" >> ../aptconfig.conf - echo "Dir::Bin::Planers \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/planers\";" >> ../aptconfig.conf + echo "Dir::Bin::Planners \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/planners\";" >> ../aptconfig.conf fi # use the autoremove from the BUILDDIRECTORY if its there, otherwise # system @@ -347,6 +347,7 @@ setupenvironment() { echo 'Binary::gpgv::APT::Sandbox::User "root";' >> aptconfig.conf # same for the solver executables echo 'APT::Solver::RunAsUser "root";' >> aptconfig.conf + echo 'APT::Planner::RunAsUser "root";' >> aptconfig.conf fi cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help index ae724fb9e..699cdef15 100755 --- a/test/integration/test-00-commands-have-help +++ b/test/integration/test-00-commands-have-help @@ -49,7 +49,7 @@ for CMD in 'apt-cache' 'apt-cdrom' 'apt-config' \ checkoptions "$cmd" done -for CMD in 'apt-dump-solver' 'apt-internal-solver' 'apt-internal-planer'; do +for CMD in 'apt-dump-solver' 'apt-internal-solver' 'apt-internal-planner'; do checkoptions "$(echo "$CMD" | tr -d '-')" done diff --git a/test/integration/test-external-installation-planer-protocol b/test/integration/test-external-installation-planner-protocol index 15ecd23a3..bd3c99c32 100755 --- a/test/integration/test-external-installation-planer-protocol +++ b/test/integration/test-external-installation-planner-protocol @@ -21,17 +21,17 @@ insertinstalledpackage 'unrelated-1' 'all' '1' setupaptarchive --no-update EIPPLOG="${TMPWORKINGDIRECTORY}/rootdir/var/log/apt/eipp.log" -echo "Dir::Log::Planer \"$EIPPLOG\";" > ./rootdir/etc/apt/apt.conf.d/eipp-logging +echo "Dir::Log::Planner \"$EIPPLOG\";" > ./rootdir/etc/apt/apt.conf.d/eipp-logging testsuccess apt update -export APT_EDSP_DUMP_FILENAME="${TMPWORKINGDIRECTORY}/eipp.dump" +export APT_EDSP_DUMP_FILENAME="${TMPWORKINGDIRECTORY}/downloaded/dump.eipp" testfailure test -r "$EIPPLOG" -testfailure aptget install foo --planer dump -y +testfailure aptget install foo --planner dump -y testfailure test -r "$EIPPLOG" testfailure grep 'unrelated-2' "$APT_EDSP_DUMP_FILENAME" testsuccessequal '2' grep -c '^Package: foo$' "$APT_EDSP_DUMP_FILENAME" testsuccessequal '1' grep -c '^Package: libfoo$' "$APT_EDSP_DUMP_FILENAME" -testsuccessequal 'Planer: dump' grep '^Planer: ' "$APT_EDSP_DUMP_FILENAME" +testsuccessequal 'Planner: dump' grep '^Planner: ' "$APT_EDSP_DUMP_FILENAME" testsuccess aptget install foo -s testsuccess aptget install foo -y @@ -41,13 +41,13 @@ Architecture: amd64 Architectures: amd64 Remove: bar:amd64 Install: libfoo:amd64 foo:amd64 -Planer: internal' head -n 6 "$EIPPLOG" -aptinternalplaner < "$EIPPLOG" > planer.log || true +Planner: internal' head -n 6 "$EIPPLOG" +aptinternalplanner < "$EIPPLOG" > planner.log || true testsuccessequal 'Remove: 6 Unpack: 2 Unpack: 4 Configure: 2 -Configure: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planer.log +Configure: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log rm -f "$EIPPLOG" testsuccess aptget install foo -s --reinstall @@ -57,10 +57,10 @@ testsuccessequal 'Request: EIPP 0.1 Architecture: amd64 Architectures: amd64 ReInstall: foo:amd64 -Planer: internal' head -n 5 "$EIPPLOG" -aptinternalplaner < "$EIPPLOG" > planer.log || true +Planner: internal' head -n 5 "$EIPPLOG" +aptinternalplanner < "$EIPPLOG" > planner.log || true testsuccessequal 'Unpack: 4 -Configure: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planer.log +Configure: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log rm -f "$EIPPLOG" testsuccess aptget purge foo -s @@ -70,6 +70,6 @@ testsuccessequal 'Request: EIPP 0.1 Architecture: amd64 Architectures: amd64 Remove: foo:amd64 -Planer: internal' head -n 5 "$EIPPLOG" -aptinternalplaner < "$EIPPLOG" > planer.log || true -testsuccessequal 'Remove: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planer.log +Planner: internal' head -n 5 "$EIPPLOG" +aptinternalplanner < "$EIPPLOG" > planner.log || true +testsuccessequal 'Remove: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log |