X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=remote%2Fsync%2Fpackages_debian_test.go;h=822e1e9f431b8e318c79e342f1a9d25207ebbbf4;hb=a975ad977fa48ac38a1955041cc559e77aa4d968;hp=6ba31ab69d9b36a3e622d66da5902a0087ce9ebc;hpb=4206e0dbca82f5df7d8e534f78cb737979880916;p=safcm%2Fsafcm.git diff --git a/remote/sync/packages_debian_test.go b/remote/sync/packages_debian_test.go index 6ba31ab..822e1e9 100644 --- a/remote/sync/packages_debian_test.go +++ b/remote/sync/packages_debian_test.go @@ -1,17 +1,5 @@ -// Copyright (C) 2021-2022 Simon Ruderich -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// SPDX-License-Identifier: GPL-3.0-or-later +// Copyright (C) 2021-2024 Simon Ruderich package sync @@ -125,6 +113,7 @@ install ok installed package-two "/usr/bin/apt-get", "install", "--assume-yes", + "--no-remove", "--no-upgrade", "--no-install-recommends", "-o", "Dpkg::Options::=--force-confdef", @@ -148,7 +137,7 @@ install ok installed golang-1.16-src install ok installed package-two `, "3: packages: installing package-one package-three", - `4: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-three"`, + `4: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-remove" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-three"`, "5: packages: command output:\nfake stdout/stderr", }, safcm.MsgSyncResp{ @@ -201,6 +190,7 @@ install ok installed golang-1.16-src "/usr/bin/apt-get", "install", "--assume-yes", + "--no-remove", "--no-upgrade", "--no-install-recommends", "-o", "Dpkg::Options::=--force-confdef", @@ -223,7 +213,7 @@ install ok installed golang-1.16-go install ok installed golang-1.16-src `, "3: packages: installing package-one package-two", - `4: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-two"`, + `4: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-remove" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-two"`, "5: packages: command output:\nfake stdout/stderr", }, safcm.MsgSyncResp{ @@ -236,7 +226,7 @@ install ok installed golang-1.16-src }, }, }, - fmt.Errorf(`"/usr/bin/apt-get" "install" "--assume-yes" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-two" failed: fake error; output: "fake stdout/stderr"`), + fmt.Errorf(`"/usr/bin/apt-get" "install" "--assume-yes" "--no-remove" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-two" failed: fake error; output: "fake stdout/stderr"`), }, {