diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-14 21:56:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 21:56:37 -0500 |
| commit | 8ce9995951b14a0a4d7252cdd97597411fd5f980 (patch) | |
| tree | b59fcfdfc29ff3979186116e23373c8d72f31169 /test/e2e/common_test.go | |
| parent | 2b7793b6121d336a285fb7b9a7612c221cbf63d2 (diff) | |
| parent | f781efd2dca4c1db54762c6edec2b915e48dd5d8 (diff) | |
| download | podman-8ce9995951b14a0a4d7252cdd97597411fd5f980.tar.gz podman-8ce9995951b14a0a4d7252cdd97597411fd5f980.tar.bz2 podman-8ce9995951b14a0a4d7252cdd97597411fd5f980.zip | |
Merge pull request #8604 from mheon/volume_plugin_impl
Initial implementation of volume plugins
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 18679dd53..2668b1e7b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -122,7 +122,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { } // Pull cirros but don't put it into the cache - pullImages := []string{cirros, fedoraToolbox} + pullImages := []string{cirros, fedoraToolbox, volumeTest} pullImages = append(pullImages, CACHE_IMAGES...) for _, image := range pullImages { podman.createArtifact(image) @@ -483,13 +483,7 @@ func (p *PodmanTestIntegration) CleanupVolume() { session := p.Podman([]string{"volume", "rm", "-fa"}) session.Wait(90) - // Stop remove service on volume cleanup - p.StopRemoteService() - - // Nuke tempdir - if err := os.RemoveAll(p.TempDir); err != nil { - fmt.Printf("%q\n", err) - } + p.Cleanup() } // InspectContainerToJSON takes the session output of an inspect |