opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-31 18:08:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix machine tests

Browse Source 
Catch up with regressions that have occurred since the tests were
originally written.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2022-06-30 14:08:05 -05:00
parent 6087fb2116
commit 76d887c770
6 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/machine/e2e/machine_test.go
View File

@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
}
const (
defaultStream string = "podman-testing"
defaultStream string = "testing"
)
var (
@ -97,6 +97,9 @@ func setup() (string, *machineTestBuilder) {
if err := os.Setenv("HOME", homeDir); err != nil {
Fail("failed to set home dir")
}
if err := os.Setenv("XDG_RUNTIME_DIR", homeDir); err != nil {
Fail("failed to set xdg_runtime dir")
}
if err := os.Unsetenv("SSH_AUTH_SOCK"); err != nil {
Fail("unable to unset SSH_AUTH_SOCK")
}
@ -120,9 +123,9 @@ func setup() (string, *machineTestBuilder) {
}
func teardown(origHomeDir string, testDir string, mb *machineTestBuilder) {
s := new(stopMachine)
r := new(rmMachine)
for _, name := range mb.names {
if _, err := mb.setName(name).setCmd(s).run(); err != nil {
if _, err := mb.setName(name).setCmd(r.withForce()).run(); err != nil {
fmt.Printf("error occurred rm'ing machine: %q\n", err)
}
}