diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-18 21:55:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 21:55:09 +0100 |
| commit | 464a1cd485febe782b655c0cc30db398345055f9 (patch) | |
| tree | 3dc5a4b90bc8d2e1837ad1319dab2c13db98ddc2 /pkg/bindings | |
| parent | d66d54282022e5f26a5baa3eebf88d6300afff74 (diff) | |
| parent | 651ddd3560c8b6ec2c8e7290f198ce6ad8c97b9c (diff) | |
| download | podman-464a1cd485febe782b655c0cc30db398345055f9.tar.gz podman-464a1cd485febe782b655c0cc30db398345055f9.tar.bz2 podman-464a1cd485febe782b655c0cc30db398345055f9.zip | |
Merge pull request #5540 from jwhonce/issues/5531
Reduce CPU usage when --timeout=0
Diffstat (limited to 'pkg/bindings')
| -rw-r--r-- | pkg/bindings/test/common_test.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/test/volumes_test.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index a4d065a14..5cd8f7e4f 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -152,7 +152,7 @@ func (b *bindingTest) startAPIService() *gexec.Session { var ( cmd []string ) - cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=999999", b.sock) + cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=0", b.sock) return b.runPodman(cmd) } diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go index c8940d46e..b1a742c43 100644 --- a/pkg/bindings/test/volumes_test.go +++ b/pkg/bindings/test/volumes_test.go @@ -3,11 +3,12 @@ package test_bindings import ( "context" "fmt" + "net/http" + "time" + "github.com/containers/libpod/pkg/api/handlers" "github.com/containers/libpod/pkg/bindings/containers" "github.com/containers/libpod/pkg/bindings/volumes" - "net/http" - "time" "github.com/containers/libpod/pkg/bindings" . "github.com/onsi/ginkgo" |