diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-07-21 11:57:23 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-07-21 18:04:11 +0200 |
| commit | 19f4a463ed790ab2f527fba7385f0dcba7247379 (patch) | |
| tree | 0c77dad9ba2d16269715f6a1d206574c67dee5a7 /pkg/machine/e2e | |
| parent | 604920dd1101c030545f4ff547b86a507b5c3ff1 (diff) | |
| download | podman-19f4a463ed790ab2f527fba7385f0dcba7247379.tar.gz podman-19f4a463ed790ab2f527fba7385f0dcba7247379.tar.bz2 podman-19f4a463ed790ab2f527fba7385f0dcba7247379.zip | |
pkg/machine/e2e: do not import from cmd/podman
The same problem again as 4374038cc67405e3f5555b1870d5bb7f6570fa5d.
Also fix the incorrect --format autocompletion struct.
It should be avoided to import cmd/podman/... packages from outside of
cmd/podman. This can lead in weird hard to debug import paths but also
can have negative consequences when imported in unit tests. In this case
it will set XDG_CONFIG_HOME and thus the machine tests this dir over the
tmp HOME env variable which is set at a later point. This caused machine
files to be leaked into the actual users home dir.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/machine/e2e')
| -rw-r--r-- | pkg/machine/e2e/info_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/machine/e2e/info_test.go b/pkg/machine/e2e/info_test.go index 759beecb5..fe0cfba32 100644 --- a/pkg/machine/e2e/info_test.go +++ b/pkg/machine/e2e/info_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - "github.com/containers/podman/v4/cmd/podman/machine" + "github.com/containers/podman/v4/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -51,7 +51,7 @@ var _ = Describe("podman machine info", func() { Expect(err).NotTo(HaveOccurred()) Expect(infoSession).Should(Exit(0)) - infoReport := &machine.Info{} + infoReport := &entities.MachineInfo{} err = jsoniter.Unmarshal(infoSession.Bytes(), infoReport) Expect(err).To(BeNil()) }) |