summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-01 22:09:38 +0100
committerGitHub <noreply@github.com>2020-12-01 22:09:38 +0100
commitc71ad9a557ee80eccde2608939c81906379fa7ae (patch)
tree74d95949a0a1795f33c542c2948cd2a41ea79457 /pkg
parente3313fdd50057ee86551c535252a4dbed82d6516 (diff)
parentc734c13904d40d40c2cc13ec55b8a6397af2db67 (diff)
downloadpodman-c71ad9a557ee80eccde2608939c81906379fa7ae.tar.gz
podman-c71ad9a557ee80eccde2608939c81906379fa7ae.tar.bz2
podman-c71ad9a557ee80eccde2608939c81906379fa7ae.zip
Merge pull request #8541 from rhatdan/man
Fix potential race condition in testing
Diffstat (limited to 'pkg')
-rw-r--r--pkg/bindings/test/containers_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index 0fb677768..15066ff1a 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -290,17 +290,17 @@ var _ = Describe("Podman containers ", func() {
Expect(wait).To(BeNil())
Expect(exitCode).To(BeNumerically("==", -1))
- errChan = make(chan error)
+ unpauseErrChan := make(chan error)
go func() {
defer GinkgoRecover()
_, waitErr := containers.Wait(bt.conn, name, &running)
- errChan <- waitErr
- close(errChan)
+ unpauseErrChan <- waitErr
+ close(unpauseErrChan)
}()
err = containers.Unpause(bt.conn, name)
Expect(err).To(BeNil())
- unPausewait := <-errChan
+ unPausewait := <-unpauseErrChan
Expect(unPausewait).To(BeNil())
Expect(exitCode).To(BeNumerically("==", -1))
})