containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17974 from vrothberg/fix-17956 

fix volume-plugin-test flake
This commit is contained in:
OpenShift Merge Robot 2023-03-30 06:26:03 -04:00 committed by GitHub
parent 8e79ec8bab 70abb4ae5b
commit 3e44a7afed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/volume_plugin_test.go
View File

@ -66,6 +66,10 @@ var _ = Describe("Podman volume plugins", func() {
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
volName := "testVolume1"
create := podmanTest.Podman([]string{"volume", "create", "--driver", pluginName, volName})
create.WaitWithDefaultTimeout()
@ -107,6 +111,10 @@ var _ = Describe("Podman volume plugins", func() {
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
volName := "testVolume1"
create := podmanTest.Podman([]string{"volume", "create", "--driver", pluginName, volName})
create.WaitWithDefaultTimeout()
@ -132,6 +140,10 @@ var _ = Describe("Podman volume plugins", func() {
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
volName := "testVolume1"
create := podmanTest.Podman([]string{"volume", "create", "--driver", pluginName, volName})
create.WaitWithDefaultTimeout()
@ -173,6 +185,10 @@ var _ = Describe("Podman volume plugins", func() {
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
volName := "testVolume1"
create := podmanTest.Podman([]string{"volume", "create", "--driver", pluginName, volName})
create.WaitWithDefaultTimeout()
@ -219,6 +235,10 @@ testvol5 = "/run/docker/plugins/testvol5.sock"`), 0o644)
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
localvol := "local-" + stringid.GenerateRandomID()
// create local volume
session := podmanTest.Podman([]string{"volume", "create", localvol})
@ -277,6 +297,10 @@ Removed:
plugin.WaitWithDefaultTimeout()
Expect(plugin).Should(Exit(0))
// Make sure the socket is available (see #17956)
err = WaitForFile(fmt.Sprintf("/run/docker/plugins/%s.sock", pluginName))
Expect(err).ToNot(HaveOccurred())
volName := "testVolume1"
create := podmanTest.Podman([]string{"volume", "create", "--driver", pluginName, volName})
create.WaitWithDefaultTimeout()