diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-22 17:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 17:51:14 +0100 |
| commit | 40ae7e74b7cba36ebf1a5e89da4e749ed936189b (patch) | |
| tree | 675abce8732b1750d52aed10f2322a751a15fda9 /test/e2e/common_test.go | |
| parent | bfc929efc44cc9255406ed6c2abec1b8a4f36dab (diff) | |
| parent | c03b6b54fd48e18c365ea0351b4e9df05587aa1d (diff) | |
| download | podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.tar.gz podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.tar.bz2 podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.zip | |
Merge pull request #12349 from edsantiago/clean_fixmes
Semiperiodic cleanup of obsolete Skip()s
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 200faae2d..6180343a7 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -320,7 +320,7 @@ func (p *PodmanTestIntegration) createArtifact(image string) { } dest := strings.Split(image, "/") destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) - fmt.Printf("Caching %s at %s...", image, destName) + fmt.Printf("Caching %s at %s...\n", image, destName) if _, err := os.Stat(destName); os.IsNotExist(err) { pull := p.PodmanNoCache([]string{"pull", image}) pull.Wait(440) @@ -466,6 +466,9 @@ func (p *PodmanTestIntegration) BuildImageWithLabel(dockerfile, imageName string // PodmanPID execs podman and returns its PID func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { podmanOptions := p.MakeOptions(args, false, false) + if p.RemoteTest { + podmanOptions = append([]string{"--remote", "--url", p.RemoteSocket}, podmanOptions...) + } fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) command := exec.Command(p.PodmanBinary, podmanOptions...) session, err := Start(command, GinkgoWriter, GinkgoWriter) |