Use SPDX license identifiers

[safcm/safcm.git] / remote / sync / packages_debian_test.go

diff --git a/remote/sync/packages_debian_test.go b/remote/sync/packages_debian_test.go
index 97b8c6182d3f6a9727c05a680bb034ddabb04fff..822e1e9f431b8e318c79e342f1a9d25207ebbbf4 100644 (file)
--- a/remote/sync/packages_debian_test.go
+++ b/remote/sync/packages_debian_test.go
@@ -1,17 +1,5 @@
-// Copyright (C) 2021  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 <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package sync
 
@@ -62,7 +50,7 @@ install ok installed  package-two
                        },
                        [][]byte{nil},
                        []error{nil},
-                       []*exec.Cmd{&exec.Cmd{
+                       []*exec.Cmd{{
                                Path: "/usr/bin/dpkg-query",
                                Args: []string{
                                        "/usr/bin/dpkg-query",
@@ -110,7 +98,7 @@ install ok installed package-two
                        },
                        [][]byte{nil, nil},
                        []error{nil, nil},
-                       []*exec.Cmd{&exec.Cmd{
+                       []*exec.Cmd{{
                                Path: "/usr/bin/dpkg-query",
                                Args: []string{
                                        "/usr/bin/dpkg-query",
@@ -119,12 +107,13 @@ install ok installed      package-two
                                },
                                Stdout: &bytes.Buffer{},
                                Stderr: &bytes.Buffer{},
-                       }, &exec.Cmd{
+                       }, {
                                Path: "/usr/bin/apt-get",
                                Args: []string{
                                        "/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{
@@ -186,7 +175,7 @@ install ok installed        golang-1.16-src
                                nil,
                                fmt.Errorf("fake error"),
                        },
-                       []*exec.Cmd{&exec.Cmd{
+                       []*exec.Cmd{{
                                Path: "/usr/bin/dpkg-query",
                                Args: []string{
                                        "/usr/bin/dpkg-query",
@@ -195,12 +184,13 @@ install ok installed      golang-1.16-src
                                },
                                Stdout: &bytes.Buffer{},
                                Stderr: &bytes.Buffer{},
-                       }, &exec.Cmd{
+                       }, {
                                Path: "/usr/bin/apt-get",
                                Args: []string{
                                        "/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"`),
                },
 
                {
@@ -258,7 +248,7 @@ install ok installed        golang-1.16-src
                        },
                        [][]byte{nil},
                        []error{nil},
-                       []*exec.Cmd{&exec.Cmd{
+                       []*exec.Cmd{{
                                Path: "/usr/bin/dpkg-query",
                                Args: []string{
                                        "/usr/bin/dpkg-query",