diff options
| author | Jhon Honce <jhonce@redhat.com> | 2022-05-03 10:51:58 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2022-05-03 16:15:59 -0700 |
| commit | 88015cf0d8c62e27452899c870555667d658427f (patch) | |
| tree | d9708a4860381b4a29034811c3253c6096d94df8 /pkg/machine/e2e/machine_test.go | |
| parent | 1e0c50df38ff955011f7ebb83a0268f3f1cd2841 (diff) | |
| download | podman-88015cf0d8c62e27452899c870555667d658427f.tar.gz podman-88015cf0d8c62e27452899c870555667d658427f.tar.bz2 podman-88015cf0d8c62e27452899c870555667d658427f.zip | |
Implement --format for machine inspect
* Fix issue of nil pointer derefence
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/machine/e2e/machine_test.go')
| -rw-r--r-- | pkg/machine/e2e/machine_test.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go index 2b3b60b2b..657014b05 100644 --- a/pkg/machine/e2e/machine_test.go +++ b/pkg/machine/e2e/machine_test.go @@ -23,14 +23,20 @@ func TestMain(m *testing.M) { const ( defaultStream string = "podman-testing" - tmpDir string = "/var/tmp" ) var ( + tmpDir = "/var/tmp" fqImageName string suiteImageName string ) +func init() { + if value, ok := os.LookupEnv("TMPDIR"); ok { + tmpDir = value + } +} + // TestLibpod ginkgo master function func TestMachine(t *testing.T) { RegisterFailHandler(Fail) @@ -70,7 +76,8 @@ var _ = SynchronizedAfterSuite(func() {}, }) func setup() (string, *machineTestBuilder) { - homeDir, err := ioutil.TempDir("/var/tmp", "podman_test") + // Set TMPDIR if this needs a new directory + homeDir, err := ioutil.TempDir("", "podman_test") if err != nil { Fail(fmt.Sprintf("failed to create home directory: %q", err)) } |