mirror of
https://github.com/containers/podman.git
synced 2025-05-22 01:27:07 +08:00
437d9d2cde
One or more tests are not taking advantage of the local image cache. This has been observed to cause a testing flake in at least one `--sigproxy` test which uses `PodmanTestIntegration.PodmanPID()`. It has a rather short timeout of 15-seconds, which isn't always enough time to pull down a remote image. Fix this by reloacing the `noCache` logic from `PodmanTest.PodmanAsUserBase()` down the stack into `PodmanTestIntegration.makeOptions()`. This also eliminates the need to also check if a remote-client is being used - since it uses a different function. Also reverse the parameter order in `PodmanTest.PodmanBase` so that everywhere is consistently `noEvents` then `noCache`. Signed-off-by: Chris Evich <cevich@redhat.com>
53 lines
1.0 KiB
Go
53 lines
1.0 KiB
Go
package utils_test
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os/exec"
|
|
"strings"
|
|
"testing"
|
|
|
|
. "github.com/containers/libpod/test/utils"
|
|
. "github.com/onsi/ginkgo"
|
|
. "github.com/onsi/gomega"
|
|
"github.com/onsi/gomega/gexec"
|
|
)
|
|
|
|
var FakeOutputs map[string][]string
|
|
var GoechoPath = "../goecho/goecho"
|
|
|
|
type FakePodmanTest struct {
|
|
PodmanTest
|
|
}
|
|
|
|
func FakePodmanTestCreate() *FakePodmanTest {
|
|
FakeOutputs = make(map[string][]string)
|
|
p := &FakePodmanTest{
|
|
PodmanTest: PodmanTest{
|
|
PodmanBinary: GoechoPath,
|
|
},
|
|
}
|
|
|
|
p.PodmanMakeOptions = p.makeOptions
|
|
return p
|
|
}
|
|
|
|
func (p *FakePodmanTest) makeOptions(args []string, noEvents, noCache bool) []string {
|
|
return FakeOutputs[strings.Join(args, " ")]
|
|
}
|
|
|
|
func StartFakeCmdSession(args []string) *PodmanSession {
|
|
var outWriter, errWriter io.Writer
|
|
command := exec.Command(GoechoPath, args...)
|
|
session, err := gexec.Start(command, outWriter, errWriter)
|
|
if err != nil {
|
|
fmt.Println(err)
|
|
}
|
|
return &PodmanSession{session}
|
|
}
|
|
|
|
func TestUtils(t *testing.T) {
|
|
RegisterFailHandler(Fail)
|
|
RunSpecs(t, "Unit test for test utils package")
|
|
}
|